From 81862e012a8b6998af266165ba58cf3c07fdf61c Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 6 Nov 2023 11:51:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=8F=91=E5=B8=83/=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1.vue | 9 ++++++++- .../pages/creatProcess/bzqdfb/step2.vue | 7 ++++--- .../pages/creatProcess/bzqdfb/step3.vue | 15 ++++++++++----- .../pages/creatProcess/bzqdfb/step4.vue | 11 ++++++++--- 4 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 5d25f4aa5..d31fa7409 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -1051,6 +1051,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true this.listForm.dataList = this.dataList this.listForm.fileName = this.fileInfoList let _formData = new FormData(); @@ -1068,8 +1069,9 @@ export default { this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { + }).finally(() => { this.saveLoading = false; + this.isSubmit = false }); }, //提交事件 @@ -1087,6 +1089,7 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true this.$http.post("lawss/activiti/startProcessRollBack", { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, @@ -1121,7 +1124,11 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false + this.saveLoading = false }); + } else { + this.isSubmit = false + this.saveLoading = false } }); } else { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 7626f1a8c..c63e8dbb9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -197,7 +197,7 @@ show-transfer show-submit :submitLoading="isSubmit" - :transferLoading="isTransfer" + :transferLoading="isSubmit" @transfer="handleTransfer" @submit="handleSubmit" > @@ -379,14 +379,13 @@ export default { }, //确认转办 checkedRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -395,6 +394,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 347ba59f3..9fb44fec5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -377,7 +377,6 @@ show-save show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" :saveLoading="saveLoading" @transfer="handleTransfer" @save="handleSave" @@ -519,14 +518,14 @@ export default { methods: { //确认转办 checkedRole (data) { - this.assigneeNewLoading = true + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -535,6 +534,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -847,6 +849,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true let _formData = new FormData(); _formData.append("id", this.bpnId || ""); _formData.append("prcType", "4"); @@ -856,11 +859,11 @@ export default { commentText: this.commentText })); saveTaskForPub(_formData).then(res => { - this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { + }).finally(() => { this.saveLoading = false; + this.isSubmit = false }); }, //提交事件 @@ -869,6 +872,7 @@ export default { this.listForm.dataList = this.dataList const json = JSON.stringify(this.listForm); this.isSubmit = true + this.saveLoading = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -881,6 +885,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }); }, //标准表格选择框改变 diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index c633a4a85..f37f7b539 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -199,9 +199,9 @@ show-transfer show-back show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" :saveLoading="saveLoading" + :isSubmitBack="isSubmit" :approval="true" @transfer="handleTransfer" @back="beforeBack" @@ -296,14 +296,14 @@ export default { methods: { //确认转办 checkedRole (data) { - this.assigneeNewLoading = true + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -312,6 +312,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -475,6 +478,7 @@ export default { //提交事件 handleSubmit() { this.isSubmit = true; + this.saveLoading = true this.listForm.approvalOpinion = "2"; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); @@ -490,6 +494,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false + this.saveLoading = false }); }, //选择标准取消事件