From 51da4ca35854d45ca89aa8cfdfdfc7729f708a72 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 17 二月 2025 10:07:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev-gly

---
 src/components/Table/lims-table.vue |   60 +++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/src/components/Table/lims-table.vue b/src/components/Table/lims-table.vue
index 7e5b4ce..513b568 100644
--- a/src/components/Table/lims-table.vue
+++ b/src/components/Table/lims-table.vue
@@ -6,7 +6,7 @@
           v-loading="tableLoading"
           :border="border"
           :data="tableData"
-          :header-cell-style="{ background: '#0e3372', color: '#cccccc' }"
+          :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
           :height="height"
           :highlight-current-row="highlightCurrentRow"
           :row-class-name="rowClassName"
@@ -25,13 +25,13 @@
         <template>
           <el-table-column align="center" label="搴忓彿" type="index" width="60" />
         </template>
-  
+
         <template v-for="(item, index) in column">
           <el-table-column :column-key="item.columnKey" :filter-method="item.filterHandler"
             :filter-multiple="item.filterMultiple" :filtered-value="item.filteredValue"
             :filters="item.filters" :fixed="item.fixed" :label="item.label"
             :min-width="item.minWidth" :prop="item.prop"
-            :show-overflow-tooltip="item.showOverflowTooltip"
+            show-overflow-tooltip
             :sortable="item.sortable ? true : false" :type="item.type" :width="item.width"
             align="center">
             <!-- <div class="123" v-if="item.type == ''"> -->
@@ -39,7 +39,7 @@
                       slot-scope="scope">
               <slot v-if="item.theadSlot" :index="index" :name="item.theadSlot" :row="scope.row" />
             </template>
-  
+
             <template slot-scope="scope">
               <!-- 鎻掓Ы -->
               <div v-if="item.dataType == 'slot'">
@@ -49,7 +49,7 @@
               <div v-else-if="item.dataType == 'progress'">
                 <el-progress :percentage="Number(scope.row[item.prop])" />
               </div>
-  
+
               <!-- tag -->
               <div v-else-if="item.dataType == 'tag'">
                 <el-tag v-if="typeof dataTypeFn(scope.row[item.prop], item.formatData) == 'string'"
@@ -62,23 +62,25 @@
                 <el-tag v-else :title="scope.row[item.prop] | formatters(item.formatData)"
                         :type="formatType(scope.row[item.prop], item.formatType)">{{ scope.row[item.prop] | formatters(item.formatData) }}</el-tag>
               </div>
-  
+
               <!-- 鎸夐挳 -->
               <div v-else-if="item.dataType == 'action'">
                 <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="iconFn(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"
@@ -105,13 +107,13 @@
       <pagination
       v-show="page.total>0"
       :total="page.total"
-      :page.sync="page.pageNum"
-      :limit.sync="page.pageSize"
+      :page.sync="page.current"
+      :limit.sync="page.size"
       @pagination="pagination"
     />
     </div>
   </template>
-  
+
   <script>
   // 娉細浠ヤ笅鏄墍鏈夐厤缃」锛屽叾涓渶甯镐娇鐢ㄧ殑灏辨槸label銆亀idth銆乸rop銆乨ataType銆乻lot
   // label 锛氬垪鍚嶏紝灏辨槸琛ㄥご涓婄殑鏍囩鍙粈涔堜簺浠�涔堬紝绫诲瀷 string
@@ -165,11 +167,6 @@
   export default {
     name: 'ZTTable',
     filters: {
-      iconFn(val, row) {
-        if (typeof (val) === 'function') {
-          return val(row);
-        } else return val;
-      },
       typeFn(val, row) {
         // console.log(val, row, '11111111');
         if (typeof (val) === 'function') {
@@ -223,7 +220,7 @@
       },
       border: {
         type: Boolean,
-        default: true
+        default: false
       },
       highlightCurrentRow: {
         type: Boolean,
@@ -244,7 +241,7 @@
       rowClassName: {
         type: Function,
         default: () => {
-  
+
         }
       },
       rowStyle: {
@@ -263,18 +260,32 @@
         default: undefined
       },
       page:{
-        type:object,
+        type:Object,
         default() {
           return {
             total:0,
-            pageNum:0,
-            pageSize:10
+            current:0,
+            size:10
           };
         }
       }
     },
-  
+
     methods: {
+      iconFn(row) {
+        if (row.name === '缂栬緫') {
+          return 'el-icon-edit'
+        } else if (row.name === '鍒犻櫎') {
+          return 'el-icon-delete'
+        } else if (row.name === '鏌ョ湅') {
+          return 'el-icon-view'
+        } else {
+          return row.icon
+        }
+        // if (typeof (val) === 'function') {
+        //   return val(row);
+        // } else return val;
+      },
       formatType(val, format) {
         if (typeof (format) === 'function') {
           return format(val);
@@ -297,10 +308,9 @@
     }
   };
   </script>
-  
+
   <style scoped>
   .el-table >>> .el-table__empty-text {
     text-align: center
   }
   </style>
-  
\ No newline at end of file

--
Gitblit v1.9.3