From e1d6ecb19c05c9cc00b7d4a29d82cbc546d5cd09 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 02 八月 2024 16:42:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/b1-report-preparation.vue | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/components/view/b1-report-preparation.vue b/src/components/view/b1-report-preparation.vue
index 93f9d91..8230629 100644
--- a/src/components/view/b1-report-preparation.vue
+++ b/src/components/view/b1-report-preparation.vue
@@ -86,7 +86,7 @@
</div>
<div class="btns">
<el-button size="small" type="primary" @click="handleDowns" :loading="outLoading" style="margin-right: 16px;">鎵归噺涓嬭浇</el-button>
- <!-- <el-upload
+ <el-upload
class="upload-demo"
:action="action"
:headers="headers"
@@ -97,8 +97,8 @@
:on-success="handleSuccess"
ref="upload"
:on-error="onError">
- <el-button size="small" type="primary">鎵归噺涓婁紶</el-button>
- </el-upload> -->
+ <el-button size="small" type="primary" :loading="inLoading">鎵归噺涓婁紶</el-button>
+ </el-upload>
</div>
</div>
<!-- <input id="input" type="file" accept=".doc,.docx"></input> -->
@@ -320,7 +320,8 @@
currentInfo: null,
option:null,
mutiList:[],
- outLoading:false
+ outLoading:false,
+ inLoading:false
}
},
computed: {
@@ -396,12 +397,19 @@
if (!isZip) {
this.$message.error('涓婁紶鏂囦欢鍙兘鏄� ZIP 鏍煎紡!');
}
+ if(isZip){
+ this.inLoading = true;
+ }
return isZip;
},
handleSuccess(response,){
+ this.inLoading = false;
if (response.code == 200) {
this.$message.success('瀵煎叆鎴愬姛')
- }
+ this.refreshTable()
+ }else{
+ this.$message.error(response.message)
+ }
},
onError(err, file, fileList,type) {
this.$message.error('涓婁紶澶辫触')
--
Gitblit v1.9.3