From 77d8b5b10162186f757c5796157ebd32f97b7531 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Thu, 23 Nov 2023 11:00:42 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/views/toCarryOutLegislativeReforms/reform/index.vue | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/views/toCarryOutLegislativeReforms/reform/index.vue b/src/views/toCarryOutLegislativeReforms/reform/index.vue
index cdeb5b5..3451f89 100644
--- a/src/views/toCarryOutLegislativeReforms/reform/index.vue
+++ b/src/views/toCarryOutLegislativeReforms/reform/index.vue
@@ -332,15 +332,20 @@
this.$confirm('������������������������������?', '������', {
confirmButtonText: '������������',
cancelButtonText: '������������',
+ distinguishCancelAndClose: true,
type: 'warning'
})
.then(() => {
this.loading = true
this.exportData()
})
- .catch(() => {
- this.loading = false
- this.exportData()
+ .catch(action => {
+ if (action === 'cancel') {
+ this.loading = false
+ this.exportData()
+ } else {
+ this.loading = false
+ }
})
},
exportData() {
--
Gitblit v1.8.0