From 914ba8443320e9b4b46a641a82799c8bfdc63056 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期六, 15 二月 2025 16:31:40 +0800
Subject: [PATCH] Merge branch 'master' into lims_new_20250213

---
 src/components/Table/lims-table.vue |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/Table/lims-table.vue b/src/components/Table/lims-table.vue
index 7cc7d82..4f4d89e 100644
--- a/src/components/Table/lims-table.vue
+++ b/src/components/Table/lims-table.vue
@@ -68,17 +68,19 @@
                 <template v-for="(o, key) in item.operation">
                   <el-button
                       v-if="o.type!='upload'"
+                      size="mini"
                       v-show="o.showHide ? o.showHide(scope.row) : true"
                       :disabled="o.disabled ? o.disabled(scope.row) : false"
-                      :icon="o.icon | iconFn(scope.row)"
-                      :plain="o.plain" :size="o.size"
-                      :style="{ 'color': o.color }"
+                      :icon="o.icon | iconFn(scope.row, o)"
+                      :plain="o.plain"
+                      :style="{ 'color': o.name === '鍒犻櫎' ? '#f56c6c' : o.color }"
                       :type="o.type | typeFn(scope.row)"
                       @click="o.clickFun(scope.row)">
                     {{ o.name }}
                   </el-button>
                   <el-upload
                     action="#"
+                    size="mini"
                     :on-change="(file, fileList)=>o.clickFun(scope.row,file, fileList)"
                     :multiple="o.multiple?o.multiple:false"
                     :limit="o.limit?o.limit:1"

--
Gitblit v1.9.3