diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index 60c2fb5d0..76431297e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -876,7 +876,7 @@ export default { managementHostName: "", //管理主体 developmentHostName: "", //开发主体 categoryName: "", //项目细分类 - carType: "" + carType: "" }, qdform: { projectId:"", @@ -1381,6 +1381,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, @@ -1415,7 +1416,11 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false }); + } else { + this.saveLoading = false + this.isSubmit = false } }); } else { @@ -1430,6 +1435,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true; let _formData = new FormData(); this.qdform.dataList = this.dataList _formData.append("id", this.bpnId || ""); @@ -1443,11 +1449,11 @@ export default { commentText: this.commentText })); saveTaskFirst(_formData).then(res => { - this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { + }).finally(() => { this.saveLoading = false; + this.isSubmit = false; }); }, // 将文本状态的id与name对应 diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index 546fb5a7d..257b9ccef 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -635,7 +635,6 @@ show-transfer show-affirm :submitLoading="isSubmit" - :transfer-loading="isTransfer" :saveLoading="saveLoading" @submit="handleSubmit" @transfer="handleTransfer" @@ -781,14 +780,14 @@ export default { }, //确认转办 checkedTransferRole (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('调整成功') @@ -797,6 +796,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -914,6 +916,7 @@ export default { // 接受按钮 handleAccept(){ this.isSubmit = true + this.saveLoading = true execTask({ todoId: this.todoId // 当前节点ID }).then(res => { @@ -921,12 +924,15 @@ export default { this.$message.success('接收成功') this.$router.push('/processCenter') } - this.isSubmit = false - }) + }).finally(() => { + this.isSubmit = false; + this.saveLoading = false; + }); }, //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true; let _formData = new FormData(); this.qdform.dataList = this.dataList _formData.append("id", this.bpnId || ""); @@ -940,7 +946,8 @@ export default { this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { + }).finally(() => { + this.isSubmit = false; this.saveLoading = false; }); }, @@ -952,6 +959,7 @@ export default { } }) this.isSubmit = true; + this.saveLoading = true; this.qdform.commentText = this.commentText; this.qdform.dataList = this.dataList const json = JSON.stringify(this.qdform); @@ -967,6 +975,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); }, diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue index 49293f16c..2cd812b9c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue @@ -635,7 +635,6 @@ show-transfer show-affirm :submitLoading="isSubmit" - :transfer-loading="isTransfer" :saveLoading="saveLoading" @submit="handleSubmit" @transfer="handleTransfer" @@ -781,14 +780,14 @@ export default { }, //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true + this.saveLoading = 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('调整成功') @@ -797,7 +796,10 @@ export default { } else { this.$message.warning(res.message) } - }) + }).finally(() => { + this.isSubmit = false; + this.saveLoading = false; + }); }, // 请求转换流程图 processNum (row) { @@ -913,6 +915,7 @@ export default { // 接受按钮 handleAccept(){ this.isSubmit = true + this.saveLoading = true execTask({ todoId: this.todoId // 当前节点ID }).then(res => { @@ -920,12 +923,15 @@ export default { this.$message.success('接收成功') this.$router.push('/processCenter') } - this.isSubmit = false - }) + }).finally(() => { + this.isSubmit = false; + this.saveLoading = false; + }); }, //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true; let _formData = new FormData(); this.qdform.dataList = this.dataList _formData.append("id", this.bpnId || ""); @@ -936,11 +942,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; }); }, //提交事件 @@ -951,6 +957,7 @@ export default { } }) this.isSubmit = true; + this.saveLoading = true; this.qdform.commentText = this.commentText; this.qdform.dataList = this.dataList const json = JSON.stringify(this.qdform); @@ -966,6 +973,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); }, diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue index 069bb9633..a30fb2d80 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue @@ -627,7 +627,6 @@ show-transfer show-affirm :submitLoading="isSubmit" - :transfer-loading="isTransfer" :saveLoading="saveLoading" @submit="handleSubmit" @transfer="handleTransfer" @@ -774,14 +773,14 @@ export default { }, //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true + this.saveLoading = 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('调整成功') @@ -790,7 +789,10 @@ export default { } else { this.$message.warning(res.message) } - }) + }).finally(() => { + this.isSubmit = false; + this.saveLoading = false; + }); }, // 请求转换流程图 processNum (row) { @@ -907,6 +909,7 @@ export default { // 接受按钮 handleAccept(){ this.isSubmit = true + this.saveLoading = true execTask({ todoId: this.todoId // 当前节点ID }).then(res => { @@ -914,7 +917,8 @@ export default { this.$message.success('接收成功') this.$router.push('/processCenter') } - this.isSubmit = false + this.isSubmit = false; + this.saveLoading = false; }) }, //提交事件 @@ -928,6 +932,8 @@ export default { this.qdform.commentText = this.commentText; this.qdform.dataList = this.dataList const json = JSON.stringify(this.qdform); + this.isSubmit = true + this.saveLoading = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -940,6 +946,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); }, diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue index ce30b3e23..6fd13a8df 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue @@ -627,7 +627,6 @@ show-transfer show-affirm :submitLoading="isSubmit" - :transfer-loading="isTransfer" :saveLoading="saveLoading" @submit="handleSubmit" @transfer="handleTransfer" @@ -772,14 +771,14 @@ export default { }, //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true + this.saveLoading = 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('调整成功') @@ -788,7 +787,10 @@ export default { } else { this.$message.warning(res.message) } - }) + }).finally(() => { + this.isSubmit = false; + this.saveLoading = false; + }); }, // 请求转换流程图 processNum (row) { @@ -904,6 +906,7 @@ export default { // 接受按钮 handleAccept(){ this.isSubmit = true + this.saveLoading = true execTask({ todoId: this.todoId // 当前节点ID }).then(res => { @@ -911,7 +914,8 @@ export default { this.$message.success('接收成功') this.$router.push('/processCenter') } - this.isSubmit = false + this.isSubmit = false; + this.saveLoading = false; }) }, //提交事件 @@ -921,7 +925,8 @@ export default { this.$set(item, 'standId', item.id) } }) - this.isSubmit = true; + this.isSubmit = true + this.saveLoading = true this.qdform.commentText = this.commentText; this.qdform.dataList = this.dataList const json = JSON.stringify(this.qdform); @@ -937,6 +942,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); },