From 282ac9e6bae273dc241ff23fae560c893237c1a8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 31 一月 2024 16:30:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/finishedProductInspection/index.vue | 18 ++++++++++++++----
src/views/quality/rawMaterial/index.vue | 20 +++++++++++++++-----
2 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 89c80e9..1856df6 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -205,6 +205,8 @@
this.table.toolbar.push({
text: '涓嬭浇妫�楠屾姤鍛�',
type: 'primary',
+ loading: false,
+ disabled: false,
fun: this.downloadProReport
})
}
@@ -229,6 +231,7 @@
},
methods: {
downloadProReport(){
+ const _than = this
let selection = this.multipleSelection
if(!selection || selection.length < 1){
this.$message.error("璇峰厛閫夋嫨妫�楠屾暟鎹�")
@@ -245,11 +248,18 @@
selection.forEach(ele=>{
ids.push(ele.id)
})
- downloadReport({ids : ids}).then(res=>{
- transformZip(res)
- }).catch(error=>{
+ _than.table.toolbar.find((e) => e.text === '涓嬭浇妫�楠屾姤鍛�').loading = true
+ _than.table.toolbar.find((e) => e.text === '涓嬭浇妫�楠屾姤鍛�').disabled = true
+ try {
+ downloadReport({ids : ids}).then(res=>{
+ transformZip(res)
+ })
+ } catch (error) {
console.log(error)
- })
+ } finally{
+ _than.table.toolbar.find((e) => e.text === '涓嬭浇妫�楠屾姤鍛�').loading = false
+ _than.table.toolbar.find((e) => e.text === '涓嬭浇妫�楠屾姤鍛�').disabled = false
+ }
}
},
//鎵撳嵃鎸夐挳
diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index 0839cf1..cad0189 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -256,7 +256,10 @@
this.table.toolbar.push({
text: '涓嬭浇妫�楠屾姤鍛�',
type: 'primary',
- fun: this.downloadReport
+ loading: false,
+ disabled: false,
+ fun: this.downloadReport,
+
})
}
if(this.permissions.quality_rawMaterial_del){
@@ -296,11 +299,18 @@
selection.forEach(ele=>{
ids.push(ele.id)
})
- downloadReport({ids : ids}).then(res=>{
- transformZip(res)
- }).catch(error=>{
+ this.table.toolbar.find((e) => e.text === '涓嬭浇妫�楠屾姤鍛�').loading = true
+ this.table.toolbar.find((e) => e.text === '涓嬭浇妫�楠屾姤鍛�').disabled = true
+ try{
+ downloadReport({ids : ids}).then(res=>{
+ transformZip(res)
+ })
+ }catch(error){
console.log(error)
- })
+ } finally{
+ this.table.toolbar.find((e) => e.text === '涓嬭浇妫�楠屾姤鍛�').loading = false
+ this.table.toolbar.find((e) => e.text === '涓嬭浇妫�楠屾姤鍛�').disabled = false
+ }
}
},
//鏌ョ湅鎶ュ憡鎸夐挳
--
Gitblit v1.9.3