From 943f66294cae53cb1617b237ec992691e01f516b Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 16:06:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/components/view/b1-expenses.vue | 44 +++++++++++++++++++++++++++++++++++---------
1 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/src/components/view/b1-expenses.vue b/src/components/view/b1-expenses.vue
index 9cab03f..62fd65a 100644
--- a/src/components/view/b1-expenses.vue
+++ b/src/components/view/b1-expenses.vue
@@ -84,7 +84,7 @@
</div>
<div class="search_thing" style="padding-left: 70px;">鎬讳环锛歿{total}}</div>
<div class="search_thing" style="padding-left: 70px;">
- <el-button size="small" type="primary" @click="handleDown" :loading="outLoading">瀵煎嚭</el-button>
+ <el-button size="small" type="primary" @click="handleDown" :loading="outLoading" v-if="isExport">瀵煎嚭</el-button>
</div>
</div>
<div class="table">
@@ -218,7 +218,8 @@
current: -1,
size: -1,
},
- outLoading:false
+ outLoading:false,
+ isExport:false
}
},
mounted() {
@@ -241,14 +242,35 @@
}
,responseType: "blob"}).then(res => {
this.outLoading = false
- this.$message.success('瀵煎嚭鎴愬姛')
const blob = new Blob([res],{ type: 'application/octet-stream' });
- const url = URL.createObjectURL(blob);
- const link = document.createElement('a');
- link.href = url;
- let date = JSON.parse(entity.dates)
- link.download = (entity.company?entity.company+' ':'')+date[0]+' - '+date[1]+'璐圭敤缁熻.xlsx';
- link.click();
+ //灏咮lob 瀵硅薄杞崲鎴愬瓧绗︿覆
+ let reader = new FileReader();
+ reader.readAsText(blob, 'utf-8');
+ reader.onload = () => {
+ try {
+ let result = JSON.parse(reader.result);
+ if (result.message) {
+ this.$message.error(result.message);
+ } else {
+ const url = URL.createObjectURL(blob);
+ const link = document.createElement('a');
+ link.href = url;
+ let date = JSON.parse(entity.dates)
+ link.download = (entity.company?entity.company+' ':'')+date[0]+' - '+date[1]+'璐圭敤缁熻.xlsx';
+ link.click();
+ this.$message.success('瀵煎嚭鎴愬姛')
+ }
+ } catch (err) {
+ console.log(err);
+ const url = URL.createObjectURL(blob);
+ const link = document.createElement('a');
+ link.href = url;
+ let date = JSON.parse(entity.dates)
+ link.download = (entity.company?entity.company+' ':'')+date[0]+' - '+date[1]+'璐圭敤缁熻.xlsx';
+ link.click();
+ this.$message.success('瀵煎嚭鎴愬姛')
+ }
+ }
})
},
getTotal(){
@@ -332,6 +354,10 @@
if (power[i].menuMethod == 'addInsOrder') {
add = true
}
+ //
+ if (power[i].menuMethod == 'export') {
+ this.isExport = true
+ }
}
if (!up) {
this.componentData.do.splice(4, 1)
--
Gitblit v1.9.3