From 3587fc859ed850ab384ae804862dd3ae35e8631b Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Mon, 6 Nov 2023 13:23:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/creatProcess/bzjd/step1.vue  |  9 +++++++--
 .../processCenter/pages/creatProcess/bzjd/step2.vue  | 12 ++++++++++--
 .../processCenter/pages/creatProcess/bzjd/step3.vue  | 11 ++++++++++-
 .../processCenter/pages/creatProcess/bzjd/step4.vue  |  6 +++++-
 .../processCenter/pages/creatProcess/bzjd/step5.vue  |  6 +++++-
 .../pages/creatProcess/bzjd/step6-1.vue              |  6 +++++-
 .../processCenter/pages/creatProcess/bzjd/step6.vue  |  6 +++++-
 7 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index f92c3a402..e663cd815 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -1056,6 +1056,7 @@ export default {
     },
     handleSave() {
       this.saveLoading = true
+      this.isSubmit = true
       let _formData = new FormData()
       _formData.append('id', this.bpnId || '')
       _formData.append('createUser', this.$store.getters.userInfo.userId)
@@ -1069,11 +1070,11 @@ export default {
         sarType: this.sarType
       }))
       saveTaskFirst(_formData).then(res => {
-        this.saveLoading = false
         this.$message.success('保存成功')
         this.bpnId = res.result
-      }).catch(e => {
+      }).finally(() => {
         this.saveLoading = false
+        this.isSubmit = false
       })
     },
     handleSubmit() {
@@ -1129,6 +1130,7 @@ export default {
                 this.$message.warning('请选择责任人')
               } else {
                 this.isSubmit = true
+                this.saveLoading = true
                 this.$http.post('lawss/activiti/startProcessRollBack', {
                   createUser: this.$store.getters.userInfo.userId,
                   createUserName: this.$store.getters.userInfo.userName,
@@ -1164,10 +1166,13 @@ export default {
                         }
                         this.$router.push('/processCenter')
                       }
+                      this.isSubmit = false
+                      this.saveLoading = false
                     })
                   } else {
                     this.$message.warning('流程启动失败')
                     this.isSubmit = false
+                    this.saveLoading = false
                   }
                 })
               }
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index 5f35d1769..52292c875 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -332,6 +332,8 @@
                 this.drawerModal = true
             },
             checkedRole (data) {
+                this.saveLoading = true
+                this.isSubmit = true
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
@@ -346,6 +348,9 @@
                     } else {
                         this.$message.warning(res.message)
                     }
+                }).finally(() => {
+                  this.saveLoading = false
+                  this.isSubmit = false
                 })
             },
           // 点击跳转标准详情
@@ -454,6 +459,7 @@
             },
             handleSave() {
                 this.saveLoading = true
+                this.isSubmit = true
                 let _formData = new FormData()
                 _formData.append('taskIds', this.taskIds)
                 _formData.append('json', JSON.stringify({
@@ -464,10 +470,10 @@
                     standInData: this.sarType
                 }))
                 saveTaskForPub(_formData).then(res => {
-                    this.saveLoading = false
                     this.$message.success('保存成功')
-                }).catch(e => {
+                }).finally(() => {
                     this.saveLoading = false
+                    this.isSubmit = false
                 })
             },
             handleSubmit() {
@@ -483,6 +489,7 @@
                             this.$message.warning('请选择执行人')
                         } else {
                             this.isSubmit = true
+                            this.saveLoading = true
                             var json = this.json
                             json.itemList = this.itemList
                             json.commentText = this.commentText2
@@ -496,6 +503,7 @@
                                     this.$router.push('/processCenter')
                                 }
                                 this.isSubmit = false
+                                this.saveLoading = false
                             })
                         }
                     } else {
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index f9dbbbb53..548446a2a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -714,6 +714,8 @@
                 this.drawerModal = true
             },
             checkedRole (data) {
+              this.saveLoading = true
+              this.isSubmit = true
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
@@ -728,6 +730,9 @@
                     } else {
                         this.$message.warning(res.message)
                     }
+                }).finally(() => {
+                  this.saveLoading = false
+                  this.isSubmit = false
                 })
             },
             // 请求转换流程图
@@ -831,6 +836,7 @@
             },
             handleSave() {
                 this.saveLoading = true
+                this.isSubmit = true
                 let _formData = new FormData()
                 _formData.append('taskIds', this.taskIds)
                 _formData.append('json', JSON.stringify({
@@ -844,7 +850,8 @@
                 saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false
                     this.$message.success('保存成功')
-                }).catch(e => {
+                }).finally(() => {
+                    this.isSubmit = false
                     this.saveLoading = false
                 })
             },
@@ -918,6 +925,7 @@
                             this.$message.warning('请选择责任人')
                         } else {
                             this.isSubmit = true
+                            this.saveLoading = true
                             var json = this.json
                             json.commentText = this.commentText3
                             json.itemList = this.itemList
@@ -932,6 +940,7 @@
                                     this.$router.push('/processCenter')
                                 }
                                 this.isSubmit = false
+                                this.saveLoading = false
                             })
                         }
                     } else {
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index 28824f9ec..eb0cb4c13 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -256,7 +256,8 @@
         <ProcessFooter
                 show-submit
                 :submitLoading="isSubmit"
-                :saveLoading="saveLoading"
+                :saveLoading="isSubmit"
+                :isSubmitBack="isSubmit"
                 @submit="handleSubmit"
                 show-back
                 @back="handleSubmitNo"
@@ -384,6 +385,7 @@
                 this.drawerModal = true
             },
             checkedRole (data) {
+                this.isSubmit = true
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
@@ -398,6 +400,8 @@
                     } else {
                         this.$message.warning(res.message)
                     }
+                }).finally(() => {
+                    this.isSubmit = false
                 })
             },
           // 点击跳转标准详情
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index 15738aa9a..b63ddc292 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -255,7 +255,8 @@
         <ProcessFooter
                 show-submit
                 :submitLoading="isSubmit"
-                :saveLoading="saveLoading"
+                :saveLoading="isSubmit"
+                :isSubmitBack="isSubmit"
                 @submit="handleSubmit"
                 show-transfer
                 @transfer="handleTransfer"
@@ -381,6 +382,7 @@
                 this.drawerModal = true
             },
             checkedRole (data) {
+              this.isSubmit = true
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
@@ -395,6 +397,8 @@
                     } else {
                         this.$message.warning(res.message)
                     }
+                }).finally(() => {
+                    this.isSubmit = false
                 })
             },
           // 点击跳转标准详情
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue
index bdd588f52..b0931bab0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue
@@ -258,7 +258,8 @@
         <ProcessFooter v-if="false"
                 show-submit
                 :submitLoading="isSubmit"
-                :saveLoading="saveLoading"
+                :saveLoading="isSubmit"
+                :isSubmitBack="isSubmit"
                 @submit="handleSubmit"
                 show-transfer
                 @transfer="handleTransfer"
@@ -385,6 +386,7 @@
                 this.drawerModal = true
             },
             checkedRole (data) {
+              this.isSubmit = true
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
@@ -399,6 +401,8 @@
                     } else {
                         this.$message.warning(res.message)
                     }
+                }).finally(() => {
+                  this.isSubmit = false
                 })
             },
           // 点击跳转标准详情
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index 0d663e0b2..b39b0cda4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -258,7 +258,8 @@
         <ProcessFooter
                 show-submit
                 :submitLoading="isSubmit"
-                :saveLoading="saveLoading"
+                :saveLoading="isSubmit"
+                :isSubmitBack="isSubmit"
                 @submit="handleSubmit"
                 show-transfer
                 @transfer="handleTransfer"
@@ -384,6 +385,7 @@
                 this.drawerModal = true
             },
             checkedRole (data) {
+              this.isSubmit = true
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
@@ -398,6 +400,8 @@
                     } else {
                         this.$message.warning(res.message)
                     }
+                }).finally(() => {
+                  this.isSubmit = false
                 })
             },
           // 点击跳转标准详情