diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index dfaee63b9..7c6c29c56 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -3236,6 +3236,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() this.fileInfoHandle() console.log(this.todoId) @@ -3254,8 +3255,9 @@ this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle() { @@ -3345,6 +3347,7 @@ // 接受按钮 handleReceive() { this.isSubmit = true + this.saveLoading = true // execTask({ // todoId: this.todoId // 当前节点ID // }).then(res => { @@ -3372,13 +3375,12 @@ this.showreceive = false // this.$router.push('/processCenter') // } + this.saveLoading = false }) }, handleSubmit() { // this.form.country=this.countryArr; // test - this.isSubmit = false - this.saveLoading = false // this.changeTree(this.form.modelData) this.$refs['form'].validate((valid) => { if (valid) { @@ -3453,6 +3455,7 @@ if (res.data === '操作成功') { this.submitLoading = false this.isSubmit = false + this.saveLoading = false if (this.$route.query.bpnId !== '') { let taskId = { id: this.$route.query.bpnId @@ -3464,15 +3467,29 @@ // 流程提交之后,应该流转至待办任务页面 this.$router.push({path: '/processCenter?tabsName=ProcessCenter'}) } else { + this.isSubmit = false + this.saveLoading = false + this.$message.warning(res.data) } } else { + this.isSubmit = false + this.saveLoading = false this.$message.warning(res.data) } }) + } else { + this.isSubmit = false + this.saveLoading = false } }) + } else { + this.isSubmit = false + this.saveLoading = false } }) + } else { + this.isSubmit = false + this.saveLoading = false } }) // this.$http.get('lawss/activiti/startProcess', {type: 'buss1'}, { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index 0f0e15e16..31e35411d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -498,6 +498,7 @@ export default { if(this.approvalFlag){ //被驳回后的保存 this.saveLoading = true; + this.isSubmit = true let qbzxdFrom = this.$refs["childForm"].qbfsForm; qbzxdFrom.type = this.toggleType qbzxdFrom.commentText = this.commentText @@ -517,12 +518,16 @@ export default { this.bpnId = res.result; }).catch(e => { this.saveLoading = false; + }).finally(() => { + this.saveLoading = false; + this.isSubmit = false }); }else{ //第一次正常保存 let qbzxdFrom = this.$refs["childForm"].qbfsForm; qbzxdFrom.type = this.toggleType this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append("id", this.bpnId || ""); _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -539,6 +544,9 @@ export default { this.bpnId = res.result }).catch(e => { this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) } }, @@ -565,6 +573,7 @@ export default { this.$refs["roleForm"].validate((valid) => { if (valid) { this.isSubmit = true; + this.saveLoading = true; qbzxdFrom.commentText = this.commentText; qbzxdFrom.addFlag = '0' let json = Object.assign(qbzxdFrom, this.roleForm); @@ -602,7 +611,12 @@ export default { this.isSubmit = false; this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); } + this.saveLoading = false; + this.isSubmit = false; }); + } else { + this.isSubmit = false; + this.saveLoading = false; } }); } else { @@ -622,6 +636,7 @@ export default { let qbzxdFrom = this.$refs["childForm"].qbfsForm; if(this.$route.query.taskInfo == '重新起草'){ this.isSubmit = true; + this.saveLoading = true; qbzxdFrom.commentText = this.commentText; qbzxdFrom.addFlag = '0' let json = Object.assign(qbzxdFrom, this.roleForm); @@ -660,6 +675,8 @@ export default { this.isSubmit = false; this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); } + this.saveLoading = false; + this.isSubmit = false; }); // } // }); @@ -667,6 +684,7 @@ export default { this.$refs["roleForm"].validate((valid) => { if (valid) { this.isSubmit = true; + this.saveLoading = true; qbzxdFrom.commentText = this.commentText; qbzxdFrom.addFlag = '0' var json = Object.assign(qbzxdFrom, this.roleForm); @@ -683,6 +701,8 @@ export default { // this.addLog(qbzxdFrom) this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); } + this.saveLoading = false; + this.isSubmit = false; }); } else { this.$message.warning("请完善人员信息"); diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue index f55548a4c..94805f29e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue @@ -326,9 +326,9 @@ show-back show-transfer show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" :saveLoading="saveLoading" + :isSubmitBack="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -483,6 +483,8 @@ export default { //确认转办 checkedRole (data) { this.assigneeNewLoading = true + this.isSubmit = true + this.saveLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -498,6 +500,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 @@ -517,6 +522,7 @@ export default { }, handleSubmit(){ this.isSubmit = true + this.saveLoading = true this.qbfsForm.passFlag = '0' this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); @@ -532,6 +538,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }, e => { }); }, @@ -540,6 +547,7 @@ export default { this.$message.warning('请填写审批意见') }else{ this.isSubmit = true + this.saveLoading = true this.qbfsForm.passFlag = '1' this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); @@ -555,6 +563,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.isSubmit = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue index 3342c5fc9..370ac353d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue @@ -322,9 +322,9 @@ show-back show-transfer show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" :saveLoading="saveLoading" + :isSubmitBack="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -477,6 +477,8 @@ export default { //确认转办 checkedRole (data) { this.assigneeNewLoading = true + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -492,6 +494,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -511,6 +516,7 @@ export default { }, handleSubmit(){ this.isSubmit = true + this.saveLoading = true this.qbfsForm.deptCenterFlag = '0' this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); @@ -526,6 +532,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }, e => { }); }, @@ -534,6 +541,7 @@ export default { this.$message.warning('请填写审批意见') }else{ this.isSubmit = true + this.saveLoading = true this.qbfsForm.deptCenterFlag = '1' this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); @@ -549,6 +557,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue index eec70e724..50e3930d8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue @@ -324,9 +324,9 @@ show-back show-transfer show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" :saveLoading="saveLoading" + :isSubmitBack="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -479,6 +479,8 @@ export default { //确认转办 checkedRole (data) { this.assigneeNewLoading = true + this.isSubmit = true + this.saveLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -494,6 +496,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -513,6 +518,7 @@ export default { }, handleSubmit(){ this.isSubmit = true + this.saveLoading = true this.qbfsForm.bzFlag = '0' this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); @@ -528,6 +534,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }, e => { }); }, @@ -536,6 +543,7 @@ export default { this.$message.warning('请填写审批意见') }else{ this.isSubmit = true + this.saveLoading = true this.qbfsForm.bzFlag = '1' this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); @@ -551,6 +559,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue index 80eb2b195..3e44506c6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue @@ -324,9 +324,9 @@ show-back show-transfer show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" :saveLoading="saveLoading" + :isSubmitBack="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -479,6 +479,8 @@ export default { //确认转办 checkedRole (data) { this.assigneeNewLoading = true + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -494,6 +496,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -513,6 +518,7 @@ export default { }, handleSubmit(){ this.isSubmit = true + this.saveLoading = true this.qbfsForm.bzfgbzFlag = '0' this.qbfsForm.planStatus = '计划已确认' if(this.qbfsForm.area){ @@ -535,6 +541,9 @@ export default { if(res && res.ok){ console.log(res) this.completeTask(json,res.data) + } else { + this.isSubmit = false + this.saveLoading = false } }) }else{ @@ -565,6 +574,7 @@ export default { } } this.isSubmit = false + this.saveLoading = false }, e => { }); }, @@ -598,6 +608,7 @@ export default { this.$message.warning('请填写审批意见') }else{ this.isSubmit = true + this.saveLoading = true this.qbfsForm.bzfgbzFlag = '1' this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); @@ -613,6 +624,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }, e => { }); }