From 5ae467cfd2252ed056a5260851b291123da0a7a0 Mon Sep 17 00:00:00 2001 From: danshihao Date: Fri, 17 Nov 2023 13:30:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E5=BA=8F=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/pages/processManage/process.vue | 3 ++ .../processManage/processClassification.vue | 3 ++ src/pages/home2/components/release/index.vue | 3 ++ .../home2/components/releaseBuss/index.vue | 3 ++ .../home2/components/releaseUs/index.vue | 3 ++ .../home2/components/releaseZL/index.vue | 3 ++ .../pages/components/BussRetrieval.vue | 30 +++++++++++++++---- .../pages/creatProcess/bzpg/step1.vue | 3 ++ .../pages/creatProcess/bzpg/step3.vue | 3 ++ .../pages/creatProcess/bzrk/step1-1.vue | 15 +++++++--- .../pages/creatProcess/bzrk/step1.vue | 15 +++++++--- .../pages/creatProcess/qbfs/step6.vue | 6 +++- .../pages/creatProcess/qbfs/step7.vue | 6 +++- .../pages/creatProcess/qbrk-product/step1.vue | 4 ++- .../creatProcess/qbrk-product/step10.vue | 6 +++- .../creatProcess/qbrk-product/step11.vue | 6 +++- .../creatProcess/qbrk-product/step12.vue | 6 +++- .../creatProcess/qbrk-product/step13.vue | 6 +++- .../creatProcess/qbrk-product/step14.vue | 6 +++- .../pages/creatProcess/qbrk-product/step2.vue | 6 +++- .../pages/creatProcess/qbrk-product/step3.vue | 6 +++- .../pages/creatProcess/qbrk-product/step4.vue | 6 +++- .../pages/creatProcess/qbrk-product/step5.vue | 6 +++- .../creatProcess/qbrk-product/step6-1.vue | 6 +++- .../pages/creatProcess/qbrk-product/step6.vue | 6 +++- .../pages/creatProcess/qbrk-product/step7.vue | 6 +++- .../pages/creatProcess/qbrk-product/step8.vue | 6 +++- .../pages/creatProcess/qbrk-product/step9.vue | 6 +++- .../creatProcess/qbrk-product/stepC3.vue | 6 +++- .../creatProcess/qbrk-product/stepC6.vue | 6 +++- .../creatProcess/qbrk-product/stepDetail.vue | 6 +++- .../pages/creatProcess/qbrk/step1-2.vue | 6 +++- .../pages/creatProcess/qbrk/step1.vue | 4 ++- .../pages/creatProcess/qbrk/step10.vue | 6 +++- .../pages/creatProcess/qbrk/step11-1.vue | 6 +++- .../pages/creatProcess/qbrk/step11.vue | 6 +++- .../pages/creatProcess/qbrk/step12.vue | 6 +++- .../pages/creatProcess/qbrk/step13.vue | 6 +++- .../pages/creatProcess/qbrk/step2.vue | 6 +++- .../pages/creatProcess/qbrk/step3.vue | 6 +++- .../pages/creatProcess/qbrk/step4.vue | 6 +++- .../pages/creatProcess/qbrk/step5.vue | 6 +++- .../pages/creatProcess/qbrk/step6.vue | 6 +++- .../pages/creatProcess/qbrk/step7.vue | 6 +++- .../pages/creatProcess/qbrk/step8.vue | 6 +++- .../pages/creatProcess/qbrk/step9.vue | 6 +++- .../pages/creatProcess/qbrk/stepC1.vue | 6 +++- .../pages/creatProcess/qbrk/stepC3.vue | 6 +++- .../pages/creatProcess/qbrk/stepC6.vue | 6 +++- .../pages/creatProcess/qbrk/stepDetail.vue | 6 +++- .../pages/creatProcess/zcrk/step1.vue | 6 +++- .../pages/creatProcess/zcrk/step3.vue | 6 +++- .../pages/creatProcess/zczqyj/step1.vue | 6 +++- .../pages/details.vue | 3 ++ .../pages/standInvolveProjectDetail.vue | 3 ++ 55 files changed, 283 insertions(+), 55 deletions(-) diff --git a/src/pages/config/pages/processManage/process.vue b/src/pages/config/pages/processManage/process.vue index cff9a181f..c94fd1456 100644 --- a/src/pages/config/pages/processManage/process.vue +++ b/src/pages/config/pages/processManage/process.vue @@ -60,6 +60,9 @@ width="55" label="序号" align="center"> + + + + + + + > + + + > + + + > + + + > + + + > + + + + + > + + { // 动态设置表格高度 diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 5eaf04a66..6d6ef2678 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1438,7 +1438,11 @@ label="序号" width="80" align="center" - > + > + + { // 动态设置表格高度 diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step6.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step6.vue index fa1968090..fe9f87d15 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step6.vue @@ -957,7 +957,11 @@ label="序号" width="80" align="center" - > + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + + + Date: Mon, 20 Nov 2023 08:55:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=8C=89=E9=92=AEloading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzdy/step1-1.vue | 9 +++++++-- .../processCenter/pages/creatProcess/bzdy/step2.vue | 2 ++ .../processCenter/pages/creatProcess/bzdy/step5-1.vue | 11 ++++++++++- .../pages/creatProcess/bzhHy-ch/step1.vue | 1 + .../processCenter/pages/creatProcess/bzpg/step1.vue | 4 ++++ .../processCenter/pages/creatProcess/bzpg/step7.vue | 2 +- .../pages/creatProcess/bzqdfb/step1-1.vue | 4 +++- .../pages/creatProcess/bzqdfb/step1-3.vue | 8 +++++++- .../pages/creatProcess/bzqdfb/step1_1.vue | 4 ++++ .../pages/creatProcess/bzzqyj/step5-1.vue | 9 +++++++++ .../pages/creatProcess/qbfs/bak/step3.vue | 9 ++++++++- .../pages/creatProcess/qbfs/bak/step4.vue | 9 ++++++++- .../processCenter/pages/creatProcess/qbfs/step4-1.vue | 3 +++ .../processCenter/pages/creatProcess/qbfs/step6.vue | 7 ++++++- .../processCenter/pages/creatProcess/qbfs/step7.vue | 2 ++ .../processCenter/pages/creatProcess/qbfz/step2.vue | 9 +++++++++ .../processCenter/pages/creatProcess/qbfz/step4-1.vue | 11 ++++++++--- .../pages/creatProcess/qbrk/step11-1.vue | 2 ++ .../pages/creatProcess/qbzxdjhgk/step1-1.vue | 6 +++++- .../pages/creatProcess/qbzxdlx/step1-1.vue | 6 +++++- .../pages/creatProcess/qbzxdlx/step1-2.vue | 11 ++++++++++- .../pages/creatProcess/qbzxdlx/step1.vue | 2 +- 22 files changed, 115 insertions(+), 16 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index c915704ab..8d24b859e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -553,6 +553,7 @@ }, handleSave() { this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -567,8 +568,9 @@ this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, handleSubmit() { @@ -576,6 +578,7 @@ if (valid) { this.$refs['Form'].validate((valid) => { if (valid) { + this.saveLoading = true this.isSubmit = true this.$http.post('lawss/activiti/startProcessRollBack', { createUser: this.$store.getters.userInfo.userId, @@ -607,9 +610,11 @@ } this.$router.push('/processCenter') } + this.saveLoading = false this.isSubmit = false }) } else { + this.saveLoading = false this.isSubmit = false this.$message.warning('流程启动失败') } diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue index c824bbae5..d19c9ac87 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue @@ -365,6 +365,8 @@ this.saveLoading = false }) } else { + this.isSubmit = false + this.saveLoading = false return this.$message.warning('请完善基础信息') } }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue index b9fff7703..4381c6a41 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue @@ -307,6 +307,8 @@ this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true + this.saveLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -321,6 +323,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 @@ -395,6 +400,7 @@ }, handleSave() { this.saveLoading = true + this.isSubmit = true let json = this.form json.responUserList = this.tableData this.form.docUser = this.newDocUser @@ -407,14 +413,16 @@ saveTaskForPub(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, handleSubmit() { this.$refs['qbkwForm'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true let json = this.jsonData json.commentText = this.commentText5 json.hzfileId = this.form.hzfileId @@ -431,6 +439,7 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } }) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index 8028ecbfb..b1d5a532f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -785,6 +785,7 @@ export default { } else { this.$message.warning('请完成流程信息的人员选择') this.isSubmit = false + this.saveLoading = false } }) } diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index 685fb41d1..127e06fee 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -1035,11 +1035,13 @@ export default { }); } else { this.isSubmit = false; + this.saveLoading = false return this.$message.warning("请完善人员信息"); } }); } else { this.isSubmit = false; + this.saveLoading = false return this.$message.warning("请完善基础信息"); } }); @@ -1092,11 +1094,13 @@ export default { }); } else { this.isSubmit = false; + this.saveLoading = false return this.$message.warning("请完善人员信息"); } }); } else { this.isSubmit = false; + this.saveLoading = false return this.$message.warning("请完善基础信息"); } }); diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue index e70736efb..0356fd132 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue @@ -635,7 +635,7 @@ export default { this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.isSubmit = true - this.saveLoading = false + this.saveLoading = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index dab8b928c..522b8bb04 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1117,6 +1117,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true this.listForm.fileName = this.fileInfoList; let _formData = new FormData(); _formData.append("id", this.bpnId || ""); @@ -1133,8 +1134,9 @@ export default { 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/bzqdfb/step1-3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue index 69e392176..602be641c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue @@ -665,6 +665,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); @@ -683,12 +684,15 @@ export default { this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { + }).finally(() => { this.saveLoading = false; + this.isSubmit = false; }); }, //提交事件 handleSubmit() { + this.isSubmit = true + this.saveLoading = true this.listForm.commentText = this.commentText const json = JSON.stringify(this.listForm); this.$http.post('lawss/activiti/completeTask', { @@ -702,6 +706,8 @@ export default { this.$message.success(res.message) this.$router.push('/processCenter') } + this.isSubmit = false + this.saveLoading = false }); }, //标准表格选择框改变 diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1_1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1_1.vue index d36095150..e8d14f962 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1_1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1_1.vue @@ -1051,6 +1051,7 @@ export default { }, //保存事件 handleSave() { + this.isSubmit = true this.saveLoading = true; this.listForm.dataList = this.dataList this.listForm.fileName = this.fileInfoList @@ -1071,6 +1072,7 @@ export default { this.bpnId = res.result; }).catch(e => { this.saveLoading = false; + this.isSubmit = false }); }, //提交事件 @@ -1088,6 +1090,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, @@ -1122,6 +1125,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false + this.saveLoading = false }); } }); diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue index 39f440ebe..cb8ca068d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue @@ -561,6 +561,8 @@ export default { } }, checkedRole (data) { + this.isSubmit = true + this.saveLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -575,6 +577,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 @@ -610,6 +615,7 @@ export default { //保存事件 handleSave() { if(this.clickFlag){ + this.isSubmit = true this.saveLoading = true; let _formData = new FormData(); let json = this.form; @@ -628,6 +634,7 @@ export default { this.bpnId = res.result; }).catch(e => { this.saveLoading = false; + this.isSubmit = false }); }else{ this.$message.warning('公开征求意见未结束，无法操作') @@ -649,6 +656,7 @@ export default { return; } this.isSubmit = true; + this.saveLoading = true; var json = this.json; json.oldinfo = this.oldData; json.onlyKey = this.onlyKey @@ -664,6 +672,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }); }else{ this.$message.warning('公开征求意见未结束，无法操作') diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/bak/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/bak/step3.vue index acbb33043..865ed1eec 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/bak/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/bak/step3.vue @@ -217,7 +217,7 @@ { }); }, @@ -366,6 +368,8 @@ export default { }, //确认转办 checkedRole (data) { + this.isSubmit = true + this.saveLoading = true this.assigneeNewLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id @@ -382,6 +386,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/bak/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/bak/step4.vue index 260f9eb71..eabfd4d66 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/bak/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/bak/step4.vue @@ -252,7 +252,7 @@ { }); }, @@ -436,6 +438,8 @@ export default { }, //确认转办 checkedRole(data) { + this.isSubmit = true; + this.saveLoading = true; this.assigneeNewLoading = true; changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id @@ -452,6 +456,9 @@ export default { } else { this.$message.warning(res.message); } + }).finally(() => { + this.saveLoading = false; + this.isSubmit = false; }); }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step4-1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step4-1.vue index 637487100..a4eeff6d1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step4-1.vue @@ -612,6 +612,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step6.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step6.vue index fe9f87d15..a62b3e2cb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step6.vue @@ -3034,7 +3034,7 @@ export default { // if(item.country !== undefined && item.country !== null){ // this.sarStandardsInfoEO.country = item.country.split(","); // } - + this.isSubmit = true this.saveLoading = true let _formData = new FormData() this.fileInfoHandle() @@ -3051,10 +3051,12 @@ export default { })) saveTaskFirst(_formData).then(res => { this.saveLoading = false + this.isSubmit = false this.$message.success('保存成功') this.bpnId = res.result }).catch(e => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -3164,6 +3166,7 @@ export default { this.$refs['userForm'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true // this.qbfsForm.commentText = this.commentText this.form.commentText = this.commentText; let jsons = JSON.stringify(this.form); @@ -3214,6 +3217,7 @@ export default { // }) // } this.isSubmit = false; + this.saveLoading = false this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); } }); @@ -3223,6 +3227,7 @@ export default { // }) } this.isSubmit = false + this.saveLoading = false }, e => { }); }else { diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step7.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step7.vue index 825f104d1..6745f8720 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step7.vue @@ -3181,6 +3181,7 @@ export default { }, // 接受按钮 handleReceive(){ + this.saveLoading = true this.isSubmit = true // execTask({ // todoId: this.todoId // 当前节点ID @@ -3206,6 +3207,7 @@ export default { // if (res.sign && res.sign === '0') { this.$message.success('接收成功') this.isSubmit = false + this.saveLoading = false this.showreceive = false // this.$router.push('/processCenter') // } diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue index 68e997e8f..26869fd6d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue @@ -312,6 +312,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); @@ -327,6 +328,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }, e => { }); } @@ -334,6 +336,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); @@ -349,6 +352,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }, e => { }); }, @@ -360,6 +364,8 @@ export default { }, //确认转办 checkedRoles (data) { + this.isSubmit = true + this.saveLoading = true this.assigneeNewLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id @@ -376,6 +382,9 @@ export default { } else { this.$message.warning(res.message) } + }).finalize(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue index 5ca8bfef6..e8ccb4bef 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue @@ -379,6 +379,7 @@ export default { this.$refs['qbfsForm'].validate((valid) => { if (valid) { this.isSubmit = true; + this.saveLoading = true; this.qbfsForm.commentText = this.commentText; this.qbfsForm.dataList = this.dataList; let json = JSON.stringify(this.qbfsForm); @@ -394,6 +395,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); }else{ @@ -418,6 +420,7 @@ export default { checkedRole(data) { this.isTransfer = true; this.isSubmit = true; + this.saveLoading = true; this.assigneeNewLoading = true; changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id @@ -425,8 +428,6 @@ export default { userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false; - this.isSubmit = false; if (res.success) { this.drawerModal = false; this.$message.success("调整成功"); @@ -435,7 +436,11 @@ export default { } else { this.$message.warning(res.message); } - }); + }).finally(() => { + this.isTransfer = false; + this.isSubmit = false; + this.saveLoading = false; + }) }, // 请求转换流程图 processNum(row) { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11-1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11-1.vue index 9a0f46292..7efca7e59 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step11-1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11-1.vue @@ -2168,6 +2168,7 @@ this.$refs['formTongGuo'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion const json = JSON.stringify(this.form); @@ -2186,6 +2187,7 @@ // this.processCreateLaws(json) } this.isSubmit = false + this.saveLoading = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue index 66feb61c9..d1424e1b1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue @@ -468,6 +468,7 @@ export default { handleSave() { if(this.approvalFlag){ //被驳回后的保存 + this.isSubmit = true this.saveLoading = true; let qbzxdFrom = this.$refs["childForm"].qbfsForm; qbzxdFrom.type = this.toggleType @@ -486,8 +487,9 @@ export default { this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { + }).finally(() => { this.saveLoading = false; + this.isSubmit = false }); }else{ //第一次正常保存 @@ -536,6 +538,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); @@ -571,6 +574,7 @@ export default { }) } this.isSubmit = false; + this.saveLoading = false this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); } }); diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1-1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1-1.vue index f379f15f6..02a1c638a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1-1.vue @@ -977,6 +977,7 @@ export default { }, // 保存按钮 handleSave() { + this.isSubmit = true this.saveLoading = true; let _formData = new FormData(); this.qblx_pageData.qblxFile = this.fileInfoList @@ -991,8 +992,9 @@ export default { this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { + }).finally(() => { this.saveLoading = false; + this.isShow = false; }) }, listSubmit (item) { @@ -1049,6 +1051,7 @@ export default { if (valid) { this.$refs["roleForm"].validate(async (valid) => { if (valid) { + this.saveLoading = true this.isSubmit = true let finishCount = 0; while (finishCount < jsonData.length) { @@ -1063,6 +1066,7 @@ export default { this.isSubmit = false this.$router.push('/processCenter') } + this.saveLoading = false this.isSubmit = false } else { return this.$message.warning("请完善人员信息"); diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1-2.vue index d56d47375..9284dbfcc 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1-2.vue @@ -767,6 +767,7 @@ export default { if (valid) { this.$refs["roleForm"].validate((valid) => { if (valid) { + this.saveLoading = true this.isSubmit = true this.qbfsForm.commentText = this.commentText let jsons = JSON.stringify(this.qbfsForm); @@ -778,7 +779,8 @@ export default { _this: this }, res => { if (res.success) { - this.isSubmit = true; + this.saveLoading = true + this.isSubmit = true this.qbfsForm.type = '5' this.qbfsForm.commentText = this.commentText; let json = Object.assign(this.qbfsForm, this.roleForm); @@ -813,6 +815,7 @@ export default { }) } this.isSubmit = false; + this.saveLoading = false this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); } }); @@ -820,6 +823,7 @@ export default { }); } this.isSubmit = false + this.saveLoading = false }, e => { }); } else { @@ -840,6 +844,8 @@ export default { }, //确认转办 checkedRole3 (data) { + this.saveLoading = true + this.isSubmit = true this.assigneeNewLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id @@ -856,6 +862,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index 357c927fe..64187d8ec 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -1062,7 +1062,7 @@ export default { }, // 保存按钮 handleSave() { - this.saveLoading = true; + this.isSubmit = true; this.saveLoading = true; let _formData = new FormData(); this.qblx_pageData.qblxFile = this.fileInfoList