From 59d52aad1c52714688dda99d3c8febf892faddbd Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 22 十一月 2023 13:26:49 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/common/ztt-table.vue | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index 5b4be1e..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,9 +960,7 @@
arr.push(this.paramArr[i])
}
}
-
return this.doCallback(this.ajaxFun, arr, selectedId)
- this.dataListLoading = false
},
doCallback(fn, args, selectedId) {
return fn
@@ -1001,6 +1000,7 @@
this.clickTable(selectObj)
}
}
+ this.$emit('change',resultData);
})
.catch((error) => {
this.dataListLoading = false
@@ -1533,6 +1533,7 @@
}
}
}
+ console.log(this.columnList);
this.tableKey = Math.random()
// this.$forceUpdate();
const currPathColumnOrder = this.currPath + '_column'
--
Gitblit v1.9.3