From 0f0d62f85d0e44c03161ef6d3043a4d70fe553dd Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 30 十一月 2023 15:07:42 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

---
 src/views/common/ztt-table.vue |   30 ++++++++++++++++++++----------
 1 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index 1cae22a..e9cb8d8 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -149,11 +149,7 @@
         v-bind="$attrs"
         v-on="$listeners"
         :highlight-current-row="true"
-        :row-key="
-          (row) => {
-            return row.id
-          }
-        "
+        :row-key="rowKey"
         @row-dblclick="dbClickRow"
         @row-contextmenu="contextMenu"
         @header-click="headClick"
@@ -507,11 +503,11 @@
             >
               <i class="el-icon-upload"></i>
               <div class="el-upload__text"><em>鐐瑰嚮瀵煎叆鏁版嵁</em></div>
-              <div class="el-upload__tip" slot="tip">
+              <div class="el-upload__tip" slot="tip" >
                 鍙兘涓婁紶xlsx/xls鏂囦欢锛屼笖涓嶈秴杩�10M<el-button
                   type="text"
                   style="font-size:12px;"
-                  @click="downDataTemplate"
+                  @click="downDataTemplate"   v-if="uploadInfo.Download"
                   >涓嬭浇妯℃澘</el-button
                 >
               </div>
@@ -563,6 +559,12 @@
   name: 'TTable',
   components: { exSlot, advancedSearchDialog, zttdraggable },
   props: {
+    rowKey: {
+      type: String,
+      default: ()=>{
+        return 'id'
+      }
+    },
     // 琛ㄦ牸鍨嬪彿锛歮ini,medium,small
     tableSize: { type: String, default: 'small' },
     // 鏁版嵁璇锋眰鏂规硶
@@ -819,6 +821,7 @@
             this.isCleanInfo = true
           }
         }
+        this.$emit("queryParam",this.queryParam)
       },
       deep: true
     },
@@ -936,7 +939,8 @@
       }
     },
     getDataList(selectedId) {
-      this.dataListLoading = true
+      // this.dataListLoading = true
+      this.dataListLoading = false
       var criteria = {}
       criteria.dateTimeFilters = this.dateTimeFilters
       criteria.multiSearchFilter = this.multiSearchFilter
@@ -959,7 +963,6 @@
           arr.push(this.paramArr[i])
         }
       }
-
       return this.doCallback(this.ajaxFun, arr, selectedId)
     },
     doCallback(fn, args, selectedId) {
@@ -967,7 +970,12 @@
         .apply(this, args)
         .then((response) => {
           var _this = this
-          _this.tableData = response.data.data.records
+          var resultData = response.data.data.records
+          if(resultData == undefined){
+            _this.tableData = response.data.data
+          }else{
+            _this.tableData = response.data.data.records
+          }
           _this.pagination.total = response.data.data.total
           // 缃┖閫変腑
           this.$refs.lmesTable.setCurrentRow()
@@ -995,6 +1003,7 @@
               this.clickTable(selectObj)
             }
           }
+        this.$emit('change',resultData);
         })
         .catch((error) => {
           this.dataListLoading = false
@@ -1527,6 +1536,7 @@
           }
         }
       }
+      console.log(this.columnList);
       this.tableKey = Math.random()
       // this.$forceUpdate();
       const currPathColumnOrder = this.currPath + '_column'

--
Gitblit v1.9.3