From 26c4f7ae79ad5ad2300876b94f96f19e4f93d53a Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 18 十二月 2023 16:02:12 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

---
 src/views/common/ztt-table.vue |   29 ++++++++++++++++++++++-------
 1 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index e9cb8d8..70b8191 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -245,6 +245,7 @@
             :show-overflow-tooltip="!item.noShowTip"
             :width="inMemoryColWidth[item.prop] || item.width"
             :prop="item.prop"
+            align="center"
           >
             <template slot="header" slot-scope="scope">
               <template v-if="item.isSearch">
@@ -324,7 +325,7 @@
                 <template v-if="!item.render">
                   <template v-if="item.formatter">
                     <span v-if="item.isTag" style="text-align: center;">
-                      <el-tag style="width:50px;margin: 3px;" :type="scope.row[item.prop] == 0 ? 'success' : 'info'">
+                      <el-tag style="width:60px;margin: 3px;" :type="scope.row[item.prop] == 0 ? 'success' : 'info'">
                         <span v-html="item.formatter(scope.row, item, scope.row[item.prop])"></span>
                       </el-tag>
                     </span>
@@ -397,6 +398,7 @@
         @size-change="sizeChangeHandle"
         :page-sizes="[10, 20, 50, 100]"
         :page-size="pagination.pageSize"
+        :page-count="pagination.size"
         :layout="
           size
             ? 'total, prev, pager, next'
@@ -507,7 +509,8 @@
                 鍙兘涓婁紶xlsx/xls鏂囦欢锛屼笖涓嶈秴杩�10M<el-button
                   type="text"
                   style="font-size:12px;"
-                  @click="downDataTemplate"   v-if="uploadInfo.Download"
+                  @click="downDataTemplate(uploadInfo.fileName)"   
+                  v-if="uploadInfo.Download"
                   >涓嬭浇妯℃澘</el-button
                 >
               </div>
@@ -718,6 +721,7 @@
         currentPage:
           this.table.currentPage == null ? 1 : this.table.currentPage,
         pageSize: this.table.pageSize == null ? 20 : this.table.pageSize,
+        size: this.table.size == null ? 7 : this.table.size,
         total: this.table.total == null ? 0 : this.table.total
       }, // 鍒嗛〉淇℃伅
       inMemoryColWidth: {}, // 璁板繂涓垪瀹斤紝榛樿鍒楀
@@ -939,8 +943,7 @@
       }
     },
     getDataList(selectedId) {
-      // this.dataListLoading = true
-      this.dataListLoading = false
+      this.dataListLoading = true
       var criteria = {}
       criteria.dateTimeFilters = this.dateTimeFilters
       criteria.multiSearchFilter = this.multiSearchFilter
@@ -966,6 +969,7 @@
       return this.doCallback(this.ajaxFun, arr, selectedId)
     },
     doCallback(fn, args, selectedId) {
+      this.tableData=[]
       return fn
         .apply(this, args)
         .then((response) => {
@@ -1401,7 +1405,6 @@
             }
           }
         }
-        console.log(this.multipleSelection)
         this.$emit('handleSelectionChange', this.multipleSelection)
       } else {
         this.multipleSelection = val
@@ -1536,7 +1539,6 @@
           }
         }
       }
-      console.log(this.columnList);
       this.tableKey = Math.random()
       // this.$forceUpdate();
       const currPathColumnOrder = this.currPath + '_column'
@@ -1578,10 +1580,19 @@
       if (response.code != '0') {
         this.$message.warning(response.msg)
       } else {
+      if(response.data!=""&&response.data!=[]&&response.data!=null){
+        this.$message({
+          message: response.data,
+          type: 'success',
+          dangerouslyUseHTMLString: true,
+        })
+      }else{
         this.$message({
           message: '涓婁紶鎴愬姛',
           type: 'success'
         })
+      }
+        this.importDialogVisible=false
         this.getDataList()
       }
       this.$refs.uploadScan.clearFiles()
@@ -1605,7 +1616,11 @@
         const blob = new Blob([response.data], {
           type: 'application/force-download'
         })
-        const filename = decodeURI('妯℃澘鏂囦欢.xlsx')
+        let fileName="妯℃澘鏂囦欢";
+        if(this.uploadInfo.fileName!=undefined&&this.uploadInfo.fileName!=''&&this.uploadInfo.fileName!=null){
+            fileName=this.uploadInfo.fileName
+        }
+        const filename = decodeURI(fileName+'.xlsx')
         // 鍒涘缓涓�涓秴閾炬帴锛屽皢鏂囦欢娴佽祴杩涘幓锛岀劧鍚庡疄鐜拌繖涓秴閾炬帴鐨勫崟鍑讳簨浠�
         const elink = document.createElement('a')
         elink.download = filename

--
Gitblit v1.9.3