From f81b67b5e039f2148ea2a4db9a94be1efd6ab789 Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 6 Nov 2023 18:27:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E5=8F=82=E4=B8=8E?= =?UTF-8?q?=E5=A4=96=E9=83=A8=E6=A0=87=E5=87=86=E5=88=B6=E4=BF=AE=E8=AE=A2?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8F=90=E6=8A=A5=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/cywbbzzxd/step1.vue | 10 ++++++++-- .../pages/creatProcess/cywbbzzxd/step2.vue | 2 +- .../pages/creatProcess/cywbbzzxd/step3.vue | 6 ++++-- .../pages/creatProcess/cywbbzzxd/step4.vue | 12 +++++++----- .../pages/creatProcess/cywbbzzxd/step5.vue | 12 +++++++----- .../pages/creatProcess/cywbbzzxd/step6.vue | 12 +++++++----- 6 files changed, 34 insertions(+), 20 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue index 02a574192..d06f9abee 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue @@ -187,6 +187,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, @@ -219,7 +220,11 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false + this.saveLoading = false }); + } else { + this.saveLoading = false + this.isSubmit = false } }); } else { @@ -230,6 +235,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); @@ -240,11 +246,11 @@ export default { roleForm: this.roleForm, })); saveTaskFirst(_formData).then(res => { - this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { + }).finally(() => { this.saveLoading = false; + this.isSubmit = false; }); }, }, diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue index 92aaecb9b..9e3def10d 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue @@ -91,7 +91,7 @@ show-save show-submit :submitLoading="isSubmit" - :saveLoading="saveLoading" + :saveLoading="isSubmit" @save="handleSave" @submit="handleSubmit" > diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue index 261920fa8..fd3d49264 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue @@ -390,9 +390,9 @@ show-save show-submit show-record - :recordLoading="recordLoading" + :recordLoading="isSubmit" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :saveLoading="isSubmit" @record="handleRecord" @save="handleSave" @submit="handleSubmit" @@ -641,6 +641,7 @@ export default { let json = { signFlag: '2', }; + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, @@ -670,6 +671,7 @@ export default { wbbzform: this.wbbzform, signFlag: '1', }; + this.isSubmit = true; this.$refs["wbbzForm"].validate((valid) => { if (valid) { this.$http.post("lawss/activiti/completeTask", { diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue index 162046d03..5d733f897 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue @@ -223,8 +223,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -369,6 +369,7 @@ export default { }; this.$refs["wbbzForm"].validate((valid) => { if (valid) { + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, @@ -389,7 +390,6 @@ export default { } }, handleSubmit() { - this.isSubmit = true; if (this.participantsData.length < 1) { this.$message.warning("项目信息不能为空"); } else { @@ -406,6 +406,7 @@ export default { }; this.$refs["wbbzForm"].validate((valid) => { if (valid) { + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, @@ -433,14 +434,13 @@ export default { }, //确认转办 checkedTransferRole (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('调整成功') @@ -449,6 +449,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, }, diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue index c2270e438..21adf95fd 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue @@ -223,8 +223,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -369,6 +369,7 @@ export default { }; this.$refs["wbbzForm"].validate((valid) => { if (valid) { + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, @@ -389,7 +390,6 @@ export default { } }, handleSubmit() { - this.isSubmit = true if (this.participantsData.length < 1) { this.$message.warning("项目信息不能为空"); } else { @@ -406,6 +406,7 @@ export default { }; this.$refs["wbbzForm"].validate((valid) => { if (valid) { + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, @@ -433,14 +434,13 @@ export default { }, //确认转办 checkedTransferRole (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('调整成功') @@ -449,6 +449,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, }, diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue index a15ff88e5..f1635d7c2 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue @@ -223,8 +223,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -369,6 +369,7 @@ export default { }; this.$refs["wbbzForm"].validate((valid) => { if (valid) { + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, @@ -389,7 +390,6 @@ export default { } }, handleSubmit() { - this.isSubmit = true if (this.participantsData.length < 1) { this.$message.warning("项目信息不能为空"); } else { @@ -406,6 +406,7 @@ export default { }; this.$refs["wbbzForm"].validate((valid) => { if (valid) { + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, @@ -433,14 +434,13 @@ export default { }, //确认转办 checkedTransferRole (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('调整成功') @@ -449,6 +449,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, },