From f3a5877f84dd9e38a5ad58adeb4398dbcff01b91 Mon Sep 17 00:00:00 2001
From: 86134 <aa>
Date: 星期六, 18 十一月 2023 14:18:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/common/ztt-table.vue |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index f0f12a8..2f5a551 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -507,11 +507,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>
@@ -819,6 +819,7 @@
             this.isCleanInfo = true
           }
         }
+        this.$emit("queryParam",this.queryParam)
       },
       deep: true
     },
@@ -959,7 +960,6 @@
           arr.push(this.paramArr[i])
         }
       }
-      this.dataListLoading = false
       return this.doCallback(this.ajaxFun, arr, selectedId)
     },
     doCallback(fn, args, selectedId) {
@@ -1000,6 +1000,7 @@
               this.clickTable(selectObj)
             }
           }
+        this.$emit('change',resultData);
         })
         .catch((error) => {
           this.dataListLoading = false
@@ -1532,6 +1533,7 @@
           }
         }
       }
+      console.log(this.columnList);
       this.tableKey = Math.random()
       // this.$forceUpdate();
       const currPathColumnOrder = this.currPath + '_column'

--
Gitblit v1.9.3