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 | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index fb445e3..70b8191 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -509,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>
@@ -942,8 +943,7 @@
}
},
getDataList(selectedId) {
- // this.dataListLoading = true
- this.dataListLoading = false
+ this.dataListLoading = true
var criteria = {}
criteria.dateTimeFilters = this.dateTimeFilters
criteria.multiSearchFilter = this.multiSearchFilter
@@ -969,6 +969,7 @@
return this.doCallback(this.ajaxFun, arr, selectedId)
},
doCallback(fn, args, selectedId) {
+ this.tableData=[]
return fn
.apply(this, args)
.then((response) => {
@@ -1582,7 +1583,8 @@
if(response.data!=""&&response.data!=[]&&response.data!=null){
this.$message({
message: response.data,
- type: 'success'
+ type: 'success',
+ dangerouslyUseHTMLString: true,
})
}else{
this.$message({
@@ -1614,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