From cd0dfbb513cfe206bfb99c6c4c8a5097cdae9abe Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 31 Oct 2023 15:22:00 +0800 Subject: [PATCH 01/70] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=A0=87=E5=87=86-?= =?UTF-8?q?=E5=8F=91=E5=B8=83-=E9=A1=BA=E5=BA=8F=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbrk-product/common/formEditList.vue | 5 +++++ .../pages/creatProcess/qbrk-product/step13.vue | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue index 3c841ec77..506336eaf 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue @@ -974,6 +974,11 @@ }, deep: true //对象的深度验证 }, + 'form.standNum': { + handler: function(val){ + this.$emit('standNumChange',val) + } + } } } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 2594dc8dc..39d32fd03 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -42,6 +42,7 @@ @formChoiceZRR2 = "formChoiceZRR2" @formChoiceZRR3 = "formChoiceZRR3" @formChoiceZRR4 = "formChoiceZRR4" + @standNumChange = "standNumChange" />
@@ -2820,8 +2821,7 @@ this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1',standSort:this.form.standSort,taskId: this.taskIds}, { _this: this }, res => { - const obj = res.data - let standSn = obj.newStandSn + const standSn = res.data this.form.standSn = standSn this.form.standNum = standSn this.form.standNumber = standSn @@ -2845,6 +2845,17 @@ } }, + standNumChange(val){ + //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + let judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + val + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + val + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + val + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } + }, processTable () { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, From 3ee543f92bb989d248089751a94caadfa3b8edc5 Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 2 Nov 2023 15:42:59 +0800 Subject: [PATCH 02/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E6=A0=87=E5=87=86=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step1.vue | 5 +++-- .../pages/creatProcess/qbrk/step10.vue | 14 +++++++++----- .../pages/creatProcess/qbrk/step11.vue | 9 ++++++--- .../pages/creatProcess/qbrk/step12.vue | 3 +++ .../pages/creatProcess/qbrk/step13.vue | 4 +--- .../pages/creatProcess/qbrk/step2.vue | 9 +++++---- .../pages/creatProcess/qbrk/step3.vue | 12 ++++++++---- .../pages/creatProcess/qbrk/step4.vue | 7 ++++++- .../pages/creatProcess/qbrk/step5.vue | 14 ++++++++------ .../pages/creatProcess/qbrk/step6.vue | 14 ++++++++------ .../pages/creatProcess/qbrk/step7.vue | 16 +++++++++------- .../pages/creatProcess/qbrk/step8.vue | 9 +++++---- .../pages/creatProcess/qbrk/step9.vue | 14 ++++++++------ .../pages/creatProcess/qbrk/stepC1.vue | 10 ++++++++-- .../pages/creatProcess/qbrk/stepC3.vue | 14 ++++++++------ .../pages/creatProcess/qbrk/stepC6.vue | 12 ++++++++---- 16 files changed, 103 insertions(+), 63 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 616ad014b..3e286aa09 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -3251,6 +3251,7 @@ // } this.saveLoading = true + this.isSubmit = true if (this.form.reviseStatus == '3' && this.standardCheckedList.length > 0) { this.form.standCode = this.standardCheckedList[0].standCode this.form.id = this.standardCheckedList[0].id @@ -3269,11 +3270,11 @@ 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 }) }, fileInfoHandle() { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue index edbf19c97..979666cf1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue @@ -1219,8 +1219,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1229,6 +1227,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2089,6 +2090,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2108,11 +2110,11 @@ 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 }) }, fileInfoHandle(){ @@ -2234,6 +2236,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); @@ -2251,12 +2254,13 @@ this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue index 2a8192451..4cfb82555 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue @@ -1218,8 +1218,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1228,6 +1226,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2233,6 +2234,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); @@ -2250,12 +2252,13 @@ this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index c613e370e..ca06a50ac 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -1155,6 +1155,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, drawerCheckZRBM(data) { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 7c7a59a11..9339d29e5 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -2540,14 +2540,12 @@ })) saveTaskForPub(_formData).then(res => { if (res.success) { - this.isSubmit = false - this.saveLoading = false this.$message.success(res.message) this.bpnId = res.result }else{ this.$message.warning(res.message) } - }).catch(e => { + }).finally(() => { this.isSubmit = false this.saveLoading = false }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue index e921045f8..f2de6332c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue @@ -1475,8 +1475,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1485,6 +1483,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2583,8 +2584,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2597,6 +2596,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }else { this.$message.warning('请先上传文件,再提交流程') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index 5f77629be..89ecc0f21 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -1189,6 +1189,9 @@ } else { this.$message.warning(res.message) } + }).finally(()=>{ + this.isSubmit = false + this.saveLoading = false }) }, processNum (row) { @@ -2461,6 +2464,7 @@ // } this.fileInfoHandle() this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2476,11 +2480,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2608,8 +2612,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2622,6 +2624,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) // this.processModelHisOneCount(this.pId) // .then(res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue index d6cf164f2..914153944 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue @@ -1240,6 +1240,9 @@ } else { this.$message.warning(res.message) } + }).finally(()=>{ + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2245,6 +2248,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); @@ -2263,12 +2267,13 @@ this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }else{ this.$message.warning("请输入意见") diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue index 0020cdc20..eaa2b1fa7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -1881,8 +1881,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1891,6 +1889,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2791,6 +2792,7 @@ this.summary=this.summaryList.map(item => item.id).join(",") this.summaryName=this.summaryList.map(item => item.name).join(",") this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2808,11 +2810,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(e => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -3001,12 +3003,12 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }, busVsFunc(){ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue index 32dd50182..47761a136 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -1525,8 +1525,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1535,6 +1533,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, drawerCheckZRBM(data) { @@ -2807,6 +2808,7 @@ // } this.fileInfoHandle() this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2822,11 +2824,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2957,8 +2959,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2971,6 +2971,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) // this.processModelHisOneCount(this.pId) // .then(res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue index 62a3a4f9e..6ad658316 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue @@ -1455,8 +1455,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1465,6 +1463,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 @@ -2374,6 +2375,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2389,11 +2391,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle() { @@ -2518,8 +2520,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path: '/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2532,6 +2532,8 @@ } else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) } else { this.$message.warning('请确认审批意见是否填写完整') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue index 030ad6a69..028863fc5 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue @@ -1247,8 +1247,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1257,6 +1255,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2288,13 +2289,13 @@ this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false - this.saveLoading = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue index d05bb0463..26f7e3e33 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue @@ -1468,8 +1468,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1478,6 +1476,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2341,6 +2342,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2356,11 +2358,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2520,13 +2522,13 @@ this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false - this.saveLoading = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue index 86e10d410..429923019 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue @@ -1405,6 +1405,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, drawerCheckZRBM(data) { @@ -2616,6 +2619,7 @@ // } this.fileInfoHandle() this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2632,11 +2636,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2793,6 +2797,8 @@ } else { this.$message.warning(res.data) } + this.isSubmit = false + this.saveLoading = false }) }else { this.$message.success(res.message) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue index b98d09257..0634bc299 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue @@ -1177,8 +1177,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1187,6 +1185,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, drawerCheckZRBM(data) { @@ -2437,6 +2438,7 @@ // } this.fileInfoHandle() this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2452,11 +2454,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2584,8 +2586,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2598,6 +2598,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) // this.processModelHisOneCount(this.pId) // .then(res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index b1451741d..b89646e81 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -1534,6 +1534,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, drawerCheckZRBM(data) { @@ -2798,6 +2801,7 @@ // } this.fileInfoHandle() this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2813,11 +2817,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, formatList (list) { @@ -2967,8 +2971,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2981,6 +2983,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) // this.processModelHisOneCount(this.pId) // .then(res => { From e9a0963c1f5273146c357e8526c88f0c48a0102d Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 2 Nov 2023 16:37:39 +0800 Subject: [PATCH 03/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E6=A0=87=E5=87=86=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk-product/step1.vue | 12 ++++++++---- .../pages/creatProcess/qbrk-product/step10.vue | 16 ++++++++++------ .../pages/creatProcess/qbrk-product/step11.vue | 16 ++++++++++------ .../pages/creatProcess/qbrk-product/step12.vue | 15 ++++++++++----- .../pages/creatProcess/qbrk-product/step13.vue | 17 ++++++++--------- .../pages/creatProcess/qbrk-product/step14.vue | 4 ++-- .../pages/creatProcess/qbrk-product/step2.vue | 9 +++++---- .../pages/creatProcess/qbrk-product/step3.vue | 14 ++++++++------ .../pages/creatProcess/qbrk-product/step4.vue | 9 ++++++--- .../pages/creatProcess/qbrk-product/step5.vue | 14 ++++++++------ .../pages/creatProcess/qbrk-product/step6-1.vue | 15 ++++++++------- .../pages/creatProcess/qbrk-product/step6.vue | 16 +++++++++------- .../pages/creatProcess/qbrk-product/step7.vue | 15 ++++++++------- .../pages/creatProcess/qbrk-product/step8.vue | 16 ++++++++++------ .../pages/creatProcess/qbrk-product/step9.vue | 16 ++++++++++------ .../pages/creatProcess/qbrk-product/stepC3.vue | 14 ++++++++------ .../pages/creatProcess/qbrk-product/stepC6.vue | 15 ++++++++------- 17 files changed, 136 insertions(+), 97 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 201f6736c..9f8abfdee 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -2984,6 +2984,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() this.fileInfoHandle() _formData.append('id', this.bpnId || '') @@ -2998,11 +2999,11 @@ 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 }) }, fileInfoHandle(){ @@ -3150,8 +3151,6 @@ }, res => { if (res.ok) { if (res.data === '操作成功') { - this.submitLoading = false - this.isSubmit = false if (this.$route.query.bpnId && this.$route.query.bpnId !== '') { let taskId = { id: this.$route.query.bpnId @@ -3166,7 +3165,12 @@ } else { this.$message.warning(res.data) } + this.submitLoading = false + this.isSubmit = false }) + } else { + this.submitLoading = false + this.isSubmit = false } }) } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue index 6afdce48c..5c94af0ed 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue @@ -1220,8 +1220,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1230,6 +1228,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2090,6 +2091,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() // _formData.append('id', this.bpnId) _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2109,11 +2111,11 @@ commentText: this.commentText })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') // this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2235,6 +2237,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); @@ -2253,12 +2256,13 @@ this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue index 9e587bd23..9aec619be 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue @@ -1220,8 +1220,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1230,6 +1228,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2090,6 +2091,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() // _formData.append('id', this.bpnId) _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2109,11 +2111,11 @@ commentText: this.commentText })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') // this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2235,6 +2237,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); @@ -2253,12 +2256,13 @@ this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue index 71fefda45..9b3ad3d03 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue @@ -1220,8 +1220,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1230,6 +1228,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2090,6 +2091,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() // _formData.append('id', this.bpnId) _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2112,8 +2114,9 @@ this.saveLoading = false this.$message.success('保存成功') // this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2235,6 +2238,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); @@ -2253,12 +2257,13 @@ this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 39d32fd03..d9b1e3739 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -1182,8 +1182,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1192,6 +1190,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, drawerCheckZRBM(data) { @@ -2419,13 +2420,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.isSubmit = false - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.isSubmit = false - this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2578,8 +2577,6 @@ if (res.success) { // this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.processCreateBuss(json) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2592,6 +2589,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }, handleSubmit() { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue index f4ff164cc..139b82df6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue @@ -2349,8 +2349,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2363,6 +2361,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue index 70141de07..766cd6ddc 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue @@ -1220,8 +1220,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1230,6 +1228,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2342,8 +2343,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2356,6 +2355,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }else { this.$message.warning('请先上传文件,再提交流程') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index 3bb135bf6..2ee710a26 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -1207,8 +1207,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1217,6 +1215,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, drawerCheckZRBM(data) { @@ -2467,6 +2468,7 @@ // } this.fileInfoHandle() this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2481,11 +2483,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2616,8 +2618,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2630,6 +2630,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) // this.processModelHisOneCount(this.pId) // .then(res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue index 89fcd951b..6ac63aaad 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue @@ -1219,8 +1219,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1229,6 +1227,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2234,6 +2235,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); @@ -2252,12 +2254,13 @@ this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue index 049410ec2..bf177238a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue @@ -1635,8 +1635,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1645,6 +1643,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2546,6 +2547,7 @@ // this.summaryName=this.summaryList.map(item => item.name).join(",") this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2563,11 +2565,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2737,12 +2739,12 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) } }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6-1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6-1.vue index 7a4a38194..71c91533b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6-1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6-1.vue @@ -1265,8 +1265,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1275,6 +1273,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, drawerCheckZRBM(data) { @@ -2511,11 +2512,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2645,8 +2646,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2659,6 +2658,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) // this.processModelHisOneCount(this.pId) // .then(res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 47070853a..c429347c5 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -1286,8 +1286,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1296,6 +1294,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, drawerCheckZRBM(data) { @@ -2518,6 +2519,7 @@ // } this.fileInfoHandle() this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2532,11 +2534,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2666,8 +2668,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2680,6 +2680,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) // this.processModelHisOneCount(this.pId) // .then(res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue index 020241a6f..b7363939e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue @@ -2181,11 +2181,11 @@ commentText: this.commentText })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') // this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2289,8 +2289,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -2299,6 +2297,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, handleTransfer() { @@ -2344,8 +2345,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2358,6 +2357,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue index b74f69bc3..9ae0fa642 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue @@ -1220,8 +1220,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1230,6 +1228,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2090,6 +2091,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() // _formData.append('id', this.bpnId) _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2109,11 +2111,11 @@ commentText: this.commentText })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') // this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2235,6 +2237,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); @@ -2253,12 +2256,13 @@ this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue index ca0e2b674..413168c65 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue @@ -1220,8 +1220,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1230,6 +1228,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2090,6 +2091,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() // _formData.append('id', this.bpnId) _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2109,11 +2111,11 @@ commentText: this.commentText })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') // this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2235,6 +2237,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); @@ -2253,12 +2256,13 @@ this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index 493f42dfa..e38a8a356 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -1186,8 +1186,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1196,6 +1194,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, drawerCheckZRBM(data) { @@ -2400,6 +2401,7 @@ // } this.fileInfoHandle() this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2414,11 +2416,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2549,8 +2551,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2563,6 +2563,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) // this.processModelHisOneCount(this.pId) // .then(res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index 4700b42d1..6353d79fe 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -1274,8 +1274,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1284,6 +1282,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, drawerCheckZRBM(data) { @@ -2521,11 +2522,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2655,8 +2656,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2669,6 +2668,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) // this.processModelHisOneCount(this.pId) // .then(res => { From b9a2004888a303a95861fec1d3fcb414c6e21115 Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 3 Nov 2023 09:56:04 +0800 Subject: [PATCH 04/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E5=A4=8D=E5=AE=A1=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbfs/step1.vue | 12 ++++++++++-- .../pages/creatProcess/qbfs/step3.vue | 8 ++++++-- .../pages/creatProcess/qbfs/step4.vue | 8 ++++++-- .../pages/creatProcess/qbfs/step5.vue | 5 +++++ .../pages/creatProcess/qbfs/step7.vue | 15 ++++++++++++++- .../pages/creatProcess/qbfs/stepC4.vue | 7 ++++++- 6 files changed, 47 insertions(+), 8 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue index 636c840c1..1b62a65be 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue @@ -1194,6 +1194,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) @@ -1206,11 +1207,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 }) }, startProcessRollBack() { @@ -1268,6 +1269,7 @@ export default { if(boo){ this.isSubmit = true + this.saveLoading = true // this.qbfsForm.fileList = this.fileList this.qbfsForm.commentText = this.commentText // 批量发起列表流程 @@ -1289,12 +1291,18 @@ export default { }) } } + this.isSubmit = false + this.saveLoading = false + } else { + this.isSubmit = false + this.saveLoading = false } } const time = setInterval(() => { const list = this.qbfsForm.modelData.filter ( item => item.processStatus === '1') if(list && this.qbfsForm.modelData && list.length === this.qbfsForm.modelData.length){ this.isSubmit = false + this.saveLoading = false clearInterval(time) this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue index 769005a90..10e3eb4ba 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue @@ -531,6 +531,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) @@ -543,11 +544,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 }) }, processEditFile(id) { @@ -641,6 +642,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/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue index 572c2610a..2cbdd7ad6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue @@ -516,6 +516,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) @@ -528,11 +529,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 }) }, processEditFile(id) { @@ -611,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/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue index 1bdc9f3aa..80910b727 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue @@ -675,6 +675,8 @@ export default { } this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } + this.isSubmit = false + this.saveLoading = false }, e => { }); }else { @@ -722,6 +724,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/step7.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step7.vue index 8026bcb2a..afd2bb08e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step7.vue @@ -3068,6 +3068,7 @@ export default { // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() this.fileInfoHandle() _formData.append('id', this.bpnId || '') @@ -3085,8 +3086,9 @@ export default { this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -3290,11 +3292,22 @@ export default { } else { this.$message.warning(res.data) } + this.submitLoading = false + this.isSubmit = false }) + } else { + this.submitLoading = false + this.isSubmit = false } }) + } else { + this.submitLoading = false + this.isSubmit = false } }) + } else { + this.submitLoading = false + this.isSubmit = false } }) // this.$http.get('lawss/activiti/startProcess', {type: 'buss1'}, { diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue index 2ee80cce9..e3dcc90f9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue @@ -511,6 +511,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) @@ -526,8 +527,9 @@ export default { this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, processEditFile(id) { @@ -606,6 +608,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 From 09bb75da3b37b878eedd3f38c2adba235faeb6dc Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 3 Nov 2023 11:10:05 +0800 Subject: [PATCH 05/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzzqyj/step1-1.vue | 8 +++++++- .../pages/creatProcess/bzzqyj/step1.vue | 9 +++++++-- .../pages/creatProcess/bzzqyj/step2.vue | 12 ++++++++++-- .../pages/creatProcess/bzzqyj/step3.vue | 19 ++++++++++++++++++- .../pages/creatProcess/bzzqyj/step4-1.vue | 12 ++++++++++++ .../pages/creatProcess/bzzqyj/step4-2.vue | 12 ++++++++++++ .../pages/creatProcess/bzzqyj/step4.vue | 11 ++++++++++- .../pages/creatProcess/bzzqyj/step5.vue | 11 ++++++++++- .../pages/creatProcess/bzzqyj/step6.vue | 10 ++++++++++ .../pages/creatProcess/bzzqyj/step7.vue | 10 ++++++++++ .../pages/creatProcess/bzzqyj/step8.vue | 10 ++++++++++ .../pages/creatProcess/bzzqyj/step9.vue | 10 ++++++++++ 12 files changed, 126 insertions(+), 8 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index a936bc7ea..cc70ad1d5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -835,6 +835,7 @@ export default { this.$refs['Form'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true this.$http.post('lawss/activiti/startProcessRollBack', { id: '', createUser: this.$store.getters.userInfo.userId, @@ -870,10 +871,13 @@ export default { } this.$router.push('/processCenter') } + this.isSubmit = false + this.saveLoading = false }) } else { this.$message.warning('流程启动失败') this.isSubmit = false + this.saveLoading = false } }) } else { @@ -887,6 +891,7 @@ export default { }, handleSave () { this.saveLoading = true + this.isSubmit = true let _formData = new FormData() this.form.filesId = this.addFjList _formData.append('id', this.bpnId || '') @@ -902,8 +907,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/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index 51facd8a0..fd999cc2e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -844,6 +844,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) @@ -856,11 +857,11 @@ export default { commentText1: this.commentText1 })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, handleSubmit() { @@ -869,6 +870,7 @@ export default { this.$refs['Form'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true this.$http.post('lawss/activiti/startProcessRollBack', { id: '', createUser: this.$store.getters.userInfo.userId, @@ -904,14 +906,17 @@ export default { } this.$router.push('/processCenter') this.isSubmit = false + this.saveLoading = false } else { this.$message.warning('流程启动失败') this.isSubmit = false + this.saveLoading = false } }) } else { this.$message.warning('流程启动失败') this.isSubmit = false + this.saveLoading = false } }) } else { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 65bd93551..698bde8b2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -261,6 +261,8 @@ export default { this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true + this.saveLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -275,6 +277,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 @@ -329,6 +334,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true let _formData = new FormData(); this.form.onlyKey = this.onlyKey _formData.append("id", this.bpnId || ""); @@ -339,17 +345,18 @@ export default { commentText2: this.commentText2 })); saveTaskForPub(_formData).then(res => { - this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { + }).finally(() => { this.saveLoading = false; + this.isSubmit = false }); }, handleSubmit() { this.$refs["bzzqyjForm"].validate((valid) => { if (valid) { this.isSubmit = true; + this.saveLoading = true; var json = this.json; json.onlyKey = this.onlyKey json.commentText = this.commentText2; @@ -368,6 +375,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }); } else { return this.$message.warning("请完善基础信息"); diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 835035451..07d7fb746 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -500,6 +500,8 @@ this.drawerModal = true }, checkedRole (data) { + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -514,6 +516,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -575,6 +580,7 @@ }, handleSave() { this.saveLoading = true; + this.isSubmit = true let _formData = new FormData(); let json = this.form json.data = this.data @@ -588,13 +594,16 @@ })); saveTaskForPub(_formData).then(res => { this.saveLoading = false; + this.isSubmit = false this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { + }).finally(() => { this.saveLoading = false; + this.isSubmit = false; }); }, handleAccept(){ + this.saveLoading = true; this.isSubmit = true execTask({ todoId: this.todoId // 当前节点ID @@ -604,11 +613,16 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, handleSubmit() { if (this.data.length < 1) { this.isSubmit = true + this.saveLoading = true var json = this.json json.onlyKey = this.onlyKey json.commentText = this.commentText3 @@ -626,6 +640,7 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } else { var a = 0 @@ -652,6 +667,7 @@ // } else { this.isSubmit = true + this.saveLoading = true var json = this.json json.commentText = this.commentText3 json.info = this.data @@ -668,6 +684,7 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index 07ce5ed81..51acd7b4b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -230,6 +230,7 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" + :isSubmitBack="isSubmit" show-transfer @transfer="handleTransfer" @submit="handleSubmit" @@ -361,6 +362,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, // 委托人 @@ -375,6 +378,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 @@ -408,6 +414,7 @@ this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true let json = this.json json.info = this.data json.onlyKey = this.onlyKey @@ -425,6 +432,7 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } else { this.$message.warning('请选择标准法规工程师分线管理员') @@ -433,6 +441,8 @@ }, handleSubmitNo() { if (this.commentText41) { + this.isSubmit = true + this.saveLoading = true var json = this.json json.spFlag = '1' json.onlyKey = this.onlyKey @@ -446,6 +456,8 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false + this.saveLoading = false }) } else { this.$message.warning('请输审批意见') diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue index ec3d165df..f5ffaf747 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue @@ -222,6 +222,7 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" + :isSubmitBack="isSubmit" show-transfer @transfer="handleTransfer" @submit="handleSubmit" @@ -353,6 +354,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, // 委托人 @@ -367,6 +370,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 @@ -398,6 +404,7 @@ }, handleSubmit() { this.isSubmit = true + this.saveLoading = true let json = this.json json.info = this.data json.commentText = this.commentText42 @@ -413,10 +420,13 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) }, handleSubmitNo() { if (this.commentText42) { + this.isSubmit = true + this.saveLoading = true var json = this.json json.bzFlag = '1' json.onlyKey = this.onlyKey @@ -430,6 +440,8 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false + this.saveLoading = false }) } else { this.$message.warning('请输入反馈意见') diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 79126f38f..225c81555 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -575,6 +575,8 @@ export default { this.drawerModal = true }, checkedRole (data) { + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -589,6 +591,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -621,6 +626,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true let _formData = new FormData(); let json = this.json json.info = this.data @@ -641,14 +647,16 @@ export default { this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { + }).finally(() => { this.saveLoading = false; + this.isSubmit = false }); }, handleSubmit() { this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true let json = this.json json.actionFlag = 0 json.commentText = this.commentText4 @@ -667,6 +675,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/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 9655bae77..bf071bbe5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -546,6 +546,8 @@ } }, checkedRole (data) { + this.isSubmit = true + this.saveLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -560,6 +562,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 @@ -596,6 +601,7 @@ handleSave() { if(this.clickFlag){ this.saveLoading = true; + this.isSubmit = true let _formData = new FormData(); let json = this.form; json.data = this.data; @@ -611,8 +617,9 @@ this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { + }).finally(() => { this.saveLoading = false; + this.isSubmit = false }); }else{ this.$message.warning('公开征求意见未结束，无法操作') @@ -634,6 +641,7 @@ return; } this.isSubmit = true; + this.saveLoading = true var json = this.json; json.oldinfo = this.oldData; json.onlyKey = this.onlyKey @@ -649,6 +657,7 @@ this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }); }else{ this.$message.warning('公开征求意见未结束，无法操作') diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index a22af334f..da18fc8b7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -261,6 +261,7 @@ :submitLoading="isSubmit" :saveLoading="saveLoading" @submit="handleSubmit" + :isSubmitBack="isSubmit" show-back @back="handleSubmitNo" show-transfer @@ -398,6 +399,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, // 委托人 @@ -412,6 +415,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 @@ -487,6 +493,7 @@ this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { this.isSubmit = true; + this.saveLoading = true var json = this.json; json.hqFlag = '0'; json.onlyKey = this.onlyKey @@ -503,6 +510,7 @@ this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false }); } else { this.$message.warning('请选择审批领导') @@ -512,6 +520,7 @@ handleSubmitNo() { if (this.commentText6) { this.isSubmit = true; + this.saveLoading = true var json = this.json; json.hqFlag = '1'; json.onlyKey = this.onlyKey @@ -526,6 +535,7 @@ this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false }); } else { this.$message.warning("请输入反馈意见"); diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 1ce4ecf56..3c6db01ae 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -252,6 +252,7 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" + :isSubmitBack="isSubmit" @submit="handleSubmit" show-back @back="handleSubmitNo" @@ -367,6 +368,8 @@ export default { this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true + this.saveLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -381,6 +384,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 @@ -454,6 +460,7 @@ export default { }, handleSubmit() { this.isSubmit = true + this.saveLoading = true var json = this.json json.bdFlag = '0' json.onlyKey = this.onlyKey @@ -468,11 +475,13 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) }, handleSubmitNo() { if (this.commentText7) { this.isSubmit = true + this.saveLoading = true var json = this.json json.bdFlag = '1' json.onlyKey = this.onlyKey @@ -487,6 +496,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/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index 35e70c095..15706ce8e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -252,6 +252,7 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" + :isSubmitBack="isSubmit" @submit="handleSubmit" show-back @back="handleSubmitNo" @@ -367,6 +368,8 @@ export default { this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true + this.saveLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -381,6 +384,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 @@ -454,6 +460,7 @@ export default { }, handleSubmit() { this.isSubmit = true + this.saveLoading = true var json = this.json json.directorFlag = '0' json.onlyKey = this.onlyKey @@ -470,11 +477,13 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) }, handleSubmitNo() { if (this.commentText8) { this.isSubmit = true + this.saveLoading = true var json = this.json json.directorFlag = '1' json.onlyKey = this.onlyKey @@ -489,6 +498,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/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index f9cf49c62..37da97e63 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -251,6 +251,7 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" + :isSubmitBack="isSubmit" @submit="handleSubmit" show-back @back="handleSubmitNo" @@ -366,6 +367,8 @@ export default { this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true + this.saveLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -380,6 +383,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 @@ -453,6 +459,7 @@ export default { }, handleSubmit() { this.isSubmit = true; + this.saveLoading = true var json = this.json; json.info = this.data2 json.presidentFlag = '0'; @@ -468,11 +475,13 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false }); }, handleSubmitNo() { if (this.commentText9) { this.isSubmit = true; + this.saveLoading = true var json = this.json; json.onlyKey = this.onlyKey json.presidentFlag = '1'; @@ -487,6 +496,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false }); } else { this.$message.warning("请输入反馈意见"); From b2bec70c9caa21f7a7217eb6d4508cba1c7de33a Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 3 Nov 2023 13:20:48 +0800 Subject: [PATCH 06/70] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbrk/step13.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 9339d29e5..f5f822be6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -1267,8 +1267,8 @@ // this.form.standCode = val + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) }, standNumChange(val){ - this.$set(this.form, 'standNum', val) this.form.standCode = this.form.standSort + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + this.$forceUpdate() }, checkedRoleTransfer (data) { this.isSubmit = true From 5fb54c8959f1948c1c61d55dc7e2aa8bac89686c Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 3 Nov 2023 15:41:35 +0800 Subject: [PATCH 07/70] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86-?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E5=8F=B7=E6=97=A0=E6=B3=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbrk/common/formEditListFb.vue | 34 +++++++++++++++---- .../pages/creatProcess/qbrk/step13.vue | 21 +++++++----- 2 files changed, 39 insertions(+), 16 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue index 0438060c1..7cd835e05 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue @@ -93,10 +93,11 @@ @@ -685,7 +686,11 @@ export default { ProcessTitle, }, props: { - formSub: { + // formSub: { + // type: Object, + // required: true + // }, + form: { type: Object, required: true }, @@ -1082,9 +1087,13 @@ export default { }, reveseStatusChange(val){ this.$emit('reveseStatusChange',val) + }, + standNumChange (val) { + this.$emit('standNumChange',val) } }, mounted () { + /* if(this.formSub && this.formSub.standSort && this.formSub.standSort !== ''){ this.getDataAsync() this.form = this.formSub @@ -1097,6 +1106,17 @@ export default { this.summaryFileList= this.summaryFileListSub this.madelSubList= this.madelSubListSub } + */ + if(this.form && this.form.standSort && this.form.standSort !== ''){ + this.getDataAsync() + this.FBGBUSSFileList= this.FBGBUSSFileListSub + this.BZSMBUSSFileList= this.BZSMBUSSFileListSub + this.LSBBBUSSFileList= this.LSBBBUSSFileListSub + this.QTWJBUSSFileList= this.QTWJBUSSFileListSub + this.GLWJBUSSFileList= this.GLWJBUSSFileListSub + this.summaryFileList= this.summaryFileListSub + this.madelSubList= this.madelSubListSub + } }, watch: { form: { @@ -1126,11 +1146,11 @@ export default { // this.$emit('reveseStatusChange',val) // } // } - 'form.standNum': { - handler: function(val){ - this.$emit('standNumChange',val) - } - } + // 'form.standNum': { + // handler: function(val){ + // this.$emit('standNumChange',val) + // } + // } } } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index f5f822be6..10e8e9782 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -20,7 +20,7 @@
Date: Fri, 3 Nov 2023 16:07:27 +0800 Subject: [PATCH 08/70] =?UTF-8?q?=E4=BC=81=E6=A0=87=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E5=BA=93-=E6=A0=91-=E9=87=8D=E6=96=B0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 0b50e077d..32f662970 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -3032,7 +3032,8 @@ export default { _this: this }, res => { if (res.ok) { - this.selectMenuListNew() + // this.selectMenuListNew() + this.getTreeAsync() this.productModal = false this.productModelAdd = { // 模态框信息 @@ -3052,7 +3053,8 @@ export default { this.$http.putData('sarResource/ts-resource', this.productModelAdd, { _this: this }, res => { - this.selectMenuListNew() + // this.selectMenuListNew() + this.getTreeAsync() this.productModal = false this.productModelAdd = { // 模态框信息 @@ -3210,7 +3212,8 @@ export default { message: "删除成功" }) this.getBussionStandTable() - this.selectMenuListNew() + // this.selectMenuListNew() + this.getTreeAsync() } else { this.$message({ type: 'warning', From f336801fe6f7e1737939f934143835cafba4cd48 Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 3 Nov 2023 16:57:54 +0800 Subject: [PATCH 09/70] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=A4=8D=E5=AE=A1?= =?UTF-8?q?=E6=B5=81=E7=A8=8B-=E6=97=A0=E6=B3=95=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbfs/step1.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue index 1b62a65be..c0592c746 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue @@ -800,9 +800,12 @@ export default { } }, mounted() { + /* $('input[type="text"]').each(function(){ $(this).attr('disabled','disabled'); }); + 你个傻逼到处挖坑，气死我了 + */ this.bpnId = this.$route.query.bpnId if (this.bpnId !== undefined) { this.getDatas() From 9260629872ffdf5db5ec2342ee6cee61e0d03cb5 Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 3 Nov 2023 17:33:21 +0800 Subject: [PATCH 10/70] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86-?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E5=8F=B7=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step13.vue | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 10e8e9782..11994bf66 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -665,20 +665,20 @@ let res = await this.verifySnExists() if(res.data){ callback() - let date = new Date(); - let year = date.getFullYear(); - this.form.standSn = this.form.standNum - this.form.standNumber = this.form.standNum - this.form.standYear = this.regDate(year) // 待带入立项标准 - //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 - let judgeFn = new RegExp(/\s+/g); - if(judgeFn.test(this.form.standSort)){ - this.form.standCode = this.form.standSort + "" + this.form.standNumber + (this.form.standYear === '' ? '' : '-' + this.form.standYear) - }else if(this.form.standSort === 'Q/QCBFC'){ - this.form.standCode = this.form.standSort + "" + this.form.standNumber + (this.form.standYear === '' ? '' : '-' + this.form.standYear) - }else { - this.form.standCode = this.form.standSort + " " + this.form.standNumber + (this.form.standYear === '' ? '' : '-' + this.form.standYear) - } + // let date = new Date(); + // let year = date.getFullYear(); + // this.form.standSn = this.form.standNum + // this.form.standNumber = this.form.standNum + // this.form.standYear = this.regDate(year) // 待带入立项标准 + // //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + // let judgeFn = new RegExp(/\s+/g); + // if(judgeFn.test(this.form.standSort)){ + // this.form.standCode = this.form.standSort + "" + this.form.standNumber + (this.form.standYear === '' ? '' : '-' + this.form.standYear) + // }else if(this.form.standSort === 'Q/QCBFC'){ + // this.form.standCode = this.form.standSort + "" + this.form.standNumber + (this.form.standYear === '' ? '' : '-' + this.form.standYear) + // }else { + // this.form.standCode = this.form.standSort + " " + this.form.standNumber + (this.form.standYear === '' ? '' : '-' + this.form.standYear) + // } }else { callback(new Error('企标顺序号已存在或已锁定')) } From eaa58e0a18bf8ec172b37e4491356a2667537bb1 Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 6 Nov 2023 08:47:11 +0800 Subject: [PATCH 11/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E5=BA=9F=E6=AD=A2=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbfz/step1.vue | 8 +++++--- .../pages/creatProcess/qbfz/step3.vue | 10 ++++++---- .../pages/creatProcess/qbfz/step4.vue | 12 +++++++----- .../pages/creatProcess/qbfz/step5.vue | 16 +++++++++------- .../pages/creatProcess/qbfz/step6.vue | 9 ++++++++- .../pages/creatProcess/qbfz/step7.vue | 16 ++++++++++++++-- 6 files changed, 49 insertions(+), 22 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue index 5f663ca9d..9cba9dc43 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue @@ -646,13 +646,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message) - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } + this.isSubmit = false + this.saveLoading = false }) } else { this.isSubmit = true + this.saveLoading = true this.standardSearch.commentText = this.commentText var json = Object.assign(this.roleForm, this.standardSearch) this.$http.post('lawss/activiti/startProcessRollBack', { @@ -685,9 +686,10 @@ export default { return res }) } - this.isSubmit = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } + this.isSubmit = false + this.saveLoading = false }) } }) diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue index eee48492c..39a009f7e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue @@ -192,7 +192,6 @@ { if(valid){ this.isSubmit = true + this.saveLoading = true this.qbfsForm.commentText = this.commentText this.qbfsForm.presentPeople = this.$store.getters.userInfo.userName this.qbfsForm.presentPeopleId = this.$store.getters.userInfo.userId @@ -339,6 +339,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }, e => { }); }else{ @@ -354,8 +355,8 @@ export default { }, //确认转办 checkedRoles (data) { - this.isTransfer = true; this.isSubmit = true; + this.saveLoading = true; this.assigneeNewLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id @@ -363,8 +364,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('调整成功') @@ -373,6 +372,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false; + this.isSubmit = false; }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue index 43e6fa471..9ab8bdd11 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue @@ -232,7 +232,6 @@ { if (valid) { this.isSubmit = true; + this.saveLoading = true; this.qbfsForm.commentText = this.commentText; this.qbfsForm.dataList = this.dataList; let json = JSON.stringify(this.qbfsForm); @@ -381,6 +381,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); }else{ @@ -403,7 +404,7 @@ export default { }, //确认转办 checkedRole(data) { - this.isTransfer = true; + this.saveLoading = true; this.isSubmit = true; this.assigneeNewLoading = true; changeAssigneeNew({ @@ -412,8 +413,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("调整成功"); @@ -422,7 +421,10 @@ export default { } else { this.$message.warning(res.message); } - }); + }).finally(() => { + this.saveLoading = false; + this.isSubmit = false; + }) }, // 请求转换流程图 processNum(row) { diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue index eb65e7b48..7ee3c4c6e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue @@ -234,7 +234,6 @@ show-transfer show-submit show-back - :transfer-loading="isTransfer" :submitLoading="isSubmit" :saveLoading="saveLoading" :isSubmitBack="isSubmit" @@ -368,6 +367,7 @@ export default { this.$message.warning('请填写审批意见') }else{ this.isSubmit = true; + this.saveLoading = true; this.qbfsForm.commentText = this.commentText; this.qbfsForm.bzFlag = '1' this.qbfsForm.dataList = this.dataList; @@ -384,6 +384,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false }, e => { }); } @@ -393,7 +394,7 @@ export default { this.$refs['qbfsForm'].validate((valid) => { if (valid) { this.isSubmit = true; - this.isTransfer = true; + this.saveLoading = true; this.qbfsForm.commentText = this.commentText; this.qbfsForm.bzFlag = '0' this.qbfsForm.dataList = this.dataList; @@ -410,7 +411,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; - this.isTransfer = false; + this.saveLoading = false; }, e => { }); }else{ @@ -433,7 +434,7 @@ export default { }, //确认转办 checkedRole(data) { - this.isTransfer = true; + this.saveLoading = true; this.isSubmit = true; this.assigneeNewLoading = true; changeAssigneeNew({ @@ -442,8 +443,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("调整成功"); @@ -452,7 +451,10 @@ export default { } else { this.$message.warning(res.message); } - }); + }).finally(() => { + this.saveLoading = false; + this.isSubmit = false; + }) }, // 请求转换流程图 processNum(row) { diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue index 89e699c28..5edd5d3c3 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue @@ -234,7 +234,6 @@ show-transfer show-submit show-back - :transfer-loading="isTransfer" :submitLoading="isSubmit" :saveLoading="saveLoading" :isSubmitBack="isSubmit" @@ -368,6 +367,7 @@ export default { this.$message.warning('请填写审批意见') }else{ this.isSubmit = true; + this.saveLoading = true; this.qbfsForm.commentText = this.commentText; this.qbfsForm.sdFlag = '1' this.qbfsForm.dataList = this.dataList; @@ -384,6 +384,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); } @@ -393,6 +394,7 @@ export default { this.$refs['qbfsForm'].validate((valid) => { if (valid) { this.isSubmit = true; + this.saveLoading = true; this.qbfsForm.commentText = this.commentText; this.qbfsForm.sdFlag = '0' this.qbfsForm.dataList = this.dataList; @@ -409,6 +411,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); }else{ @@ -433,6 +436,7 @@ export default { checkedRole(data) { this.isTransfer = true; this.isSubmit = true; + this.saveLoading = true; this.assigneeNewLoading = true; changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id @@ -450,6 +454,9 @@ export default { } else { this.$message.warning(res.message); } + }).finally(() => { + this.saveLoading = false; + this.isSubmit = false; }); }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue index 9963976a9..4c7655f9e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue @@ -234,7 +234,6 @@ show-transfer show-submit show-back - :transfer-loading="isTransfer" :submitLoading="isSubmit" :saveLoading="saveLoading" :isSubmitBack="isSubmit" @@ -368,6 +367,7 @@ export default { this.$message.warning('请填写审批意见') }else{ this.isSubmit = true; + this.saveLoading = true; this.qbfsForm.commentText = this.commentText; this.qbfsForm.bafzFlag = '1' this.qbfsForm.dataList = this.dataList; @@ -384,6 +384,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); } @@ -393,6 +394,7 @@ export default { this.$refs['qbfsForm'].validate((valid) => { if (valid) { this.isSubmit = true; + this.saveLoading = true; this.qbfsForm.commentText = this.commentText; this.qbfsForm.bafzFlag = '0' this.qbfsForm.dataList = this.dataList; @@ -404,9 +406,14 @@ export default { this.$http._getData('lawss/sarBussionessStand/repeal',params,{}).then(res => { if(res && res.ok){ this.completeTask(json) + } else { + this.isSubmit = false; + this.saveLoading = false; } }).catch(e=>{ console.log(e) + this.isSubmit = false; + this.saveLoading = false; }) }else{ this.$message.warning('请完善基础信息') @@ -426,6 +433,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); }, @@ -445,6 +453,7 @@ export default { checkedRole(data) { this.isTransfer = true; this.isSubmit = true; + this.saveLoading = true; this.assigneeNewLoading = true; changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id @@ -462,7 +471,10 @@ export default { } else { this.$message.warning(res.message); } - }); + }).finally(()=>{ + this.saveLoading = false; + this.isSubmit = false; + }) }, // 请求转换流程图 processNum(row) { From 3a403e87615f436402c303cf20617f6541e55227 Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 6 Nov 2023 09:32:12 +0800 Subject: [PATCH 12/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E5=88=B6=E4=BF=AE=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1?= =?UTF-8?q?=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step1-2.vue | 23 ++++++++++++++++--- .../pages/creatProcess/qbzxdjhgk/step1.vue | 20 ++++++++++++++++ .../pages/creatProcess/qbzxdjhgk/step2.vue | 11 ++++++++- .../pages/creatProcess/qbzxdjhgk/step3.vue | 11 ++++++++- .../pages/creatProcess/qbzxdjhgk/step4.vue | 11 ++++++++- .../pages/creatProcess/qbzxdjhgk/step5.vue | 14 ++++++++++- 6 files changed, 83 insertions(+), 7 deletions(-) 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 => { }); } From 6dc35be591548d235f5c9b25b978a022deb31cd4 Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 6 Nov 2023 09:49:06 +0800 Subject: [PATCH 13/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E5=88=B6=E4=BF=AE=E8=AE=A2=E7=AB=8B=E9=A1=B9=E8=AE=A1?= =?UTF-8?q?=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbzxdjhgk/step2.vue | 2 +- .../pages/creatProcess/qbzxdlx/step1.vue | 6 +++++- .../pages/creatProcess/qbzxdlx/step2.vue | 15 ++++++++++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue index 94805f29e..92a6c12c3 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue @@ -563,7 +563,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false - this.isSubmit = false + this.saveLoading = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index 46ae3288a..357c927fe 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -1062,6 +1062,7 @@ export default { }, // 保存按钮 handleSave() { + this.saveLoading = true; this.saveLoading = true; let _formData = new FormData(); this.qblx_pageData.qblxFile = this.fileInfoList @@ -1076,8 +1077,9 @@ export default { this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { + }).finally(() => { this.saveLoading = false; + this.isSubmit = false; }) }, listSubmit (item) { @@ -1137,6 +1139,7 @@ export default { this.$refs["roleForm"].validate(async (valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true; let finishCount = 0; while (finishCount < jsonData.length) { await this.listSubmit(jsonData[finishCount]) @@ -1151,6 +1154,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false; } else { return this.$message.warning("请完善人员信息"); } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 1300e90df..153cef2aa 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -539,7 +539,6 @@ { if (valid) { this.isSubmit = true + this.saveLoading = true this.qbfsForm.commentText = this.commentText this.qbfsForm.LXD = this.lxdList && this.lxdList.length > 0 ? this.lxdList[0].id : '' this.qbfsForm.LXDName = '立项单' @@ -903,11 +903,19 @@ export default { this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); // this.isSubmit = false; } + this.isSubmit = false; + this.saveLoading = false; }); + } else { + this.isSubmit = false; + this.saveLoading = false; } }); // } // }) + } else { + this.isSubmit = false; + this.saveLoading = false; } // this.isSubmit = false }, e => { @@ -931,6 +939,8 @@ export default { //确认转办 checkedRole3 (data) { this.assigneeNewLoading = true + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -946,6 +956,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 From dda0b8c60c649e552b16e4881fdc2ae583cd12ee Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 6 Nov 2023 10:23:35 +0800 Subject: [PATCH 14/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1-1.vue | 18 +++++++++++------- .../pages/creatProcess/bzrk/step1.vue | 16 +++++++++++----- .../pages/creatProcess/bzrk/step2.vue | 12 ++++++++++++ .../pages/creatProcess/bzrk/step3.vue | 12 ++++++++++-- .../pages/creatProcess/bzrk/step4.vue | 2 ++ 5 files changed, 46 insertions(+), 14 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1-1.vue index 2c56a6a75..80694298f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1-1.vue @@ -3597,6 +3597,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -3616,11 +3617,11 @@ 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 }) }, fileInfoHandle() { @@ -3687,6 +3688,7 @@ if (res.ok) { this.fileInfoHandle() this.isSubmit = true + this.saveLoading = true // this.form.country = this.countryArr; var json = Object.assign(this.form, this.roleForm) json.zrUserId = this.form.zrUserId @@ -3719,7 +3721,6 @@ }, res => { if (res.success) { this.$message.success(res.message) - this.isSubmit = false if (this.bpnId !== '') { let taskId = { id: this.bpnId @@ -3732,11 +3733,13 @@ this.$router.push({path: '/processCenter?tabsName=ProcessCenter'}) } else { this.$message.warning(res.message) - this.isSubmit = true } + this.saveLoading = false + this.isSubmit = false }) } else { this.isSubmit = false + this.saveLoading = false } }) } else { @@ -3747,6 +3750,7 @@ } else { this.fileInfoHandle() this.isSubmit = true + this.saveLoading = true // this.form.country = this.countryArr; var json = Object.assign(this.form, this.roleForm) json.zrUserId = this.form.zrUserId @@ -3779,7 +3783,6 @@ }, res => { if (res.success) { this.$message.success(res.message) - this.isSubmit = false if (this.bpnId !== '') { let taskId = { id: this.bpnId @@ -3790,12 +3793,13 @@ } // 流程提交之后，应该流转至待办任务页面 this.$router.push({path: '/processCenter?tabsName=ProcessCenter'}) - } else { - this.isSubmit = false } + this.isSubmit = false + this.saveLoading = false }) } else { this.isSubmit = false + this.saveLoading = false } }) } diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index d1a9fef06..5eaf04a66 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -3606,6 +3606,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -3628,8 +3629,9 @@ this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle() { @@ -3696,6 +3698,7 @@ if (res.ok) { this.fileInfoHandle() this.isSubmit = true + this.saveLoading = true // this.form.country = this.countryArr; var json = Object.assign(this.form, this.roleForm) json.zrUserId = this.form.zrUserId @@ -3741,11 +3744,13 @@ this.$router.push({path: '/processCenter?tabsName=ProcessCenter'}) } else { this.$message.warning(res.message) - this.isSubmit = true } + this.isSubmit = false + this.saveLoading = false }) } else { this.isSubmit = false + this.saveLoading = false } }) } else { @@ -3756,6 +3761,7 @@ } else { this.fileInfoHandle() this.isSubmit = true + this.saveLoading = true // this.form.country = this.countryArr; var json = Object.assign(this.form, this.roleForm) json.zrUserId = this.form.zrUserId @@ -3788,7 +3794,6 @@ }, res => { if (res.success) { this.$message.success(res.message) - this.isSubmit = false if (this.bpnId !== '') { let taskId = { id: this.bpnId @@ -3799,12 +3804,13 @@ } // 流程提交之后，应该流转至待办任务页面 this.$router.push({path: '/processCenter?tabsName=ProcessCenter'}) - } else { - this.isSubmit = false } + this.isSubmit = false + this.saveLoading = false }) } else { this.isSubmit = false + this.saveLoading = false } }) } diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 79d7726ca..d17d72d7c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -1045,6 +1045,8 @@ export default { methods: { checkedRole(data) { this.assigneeNewLoading = true + this.isSubmit = true + this.saveLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId: this.$store.getters.userInfo.userId, // 委托人 @@ -1059,6 +1061,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, downloadFileNew(attId) { @@ -1289,6 +1294,7 @@ export default { }, handleSubmit() { this.isSubmit = true; + this.saveLoading = true; this.form.commentText = this.commentText; this.form.approvalOpinion = this.formTongGuo.approvalOpinion; if (this.form.syrz.length === 0) { @@ -1346,6 +1352,9 @@ export default { } else { this.processCreateStand(json); } + } else { + this.isSubmit = false; + this.saveLoading = false; } }); }, @@ -1378,6 +1387,9 @@ export default { this.$message.warning(res.message) this.isSubmit = false } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, getDicTypeListCode(res,json) { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 1266830c7..27b1a2596 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -1016,6 +1016,8 @@ export default { methods: { checkedRole (data) { this.assigneeNewLoading = true + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -1032,6 +1034,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, downloadFileNew(attId) { @@ -1237,6 +1242,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) @@ -1252,15 +1258,16 @@ export default { submitType: this.submitType })) saveTaskFirst(_formData).then(res => { - 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.form.submitType = this.submitType this.form.commentText = this.commentText this.form.approvalOpinion = this.approvalOpinion @@ -1280,6 +1287,7 @@ export default { this.$message.success(res.message) } this.isSubmit = false + this.saveLoading = false }) }, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index d0963cd1d..1fa7656d9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -2961,6 +2961,7 @@ export default { } else { this.fileInfoHandle(); this.isSubmit = true + this.saveLoading = true this.form.submitType = this.submitType this.form.commentText = this.commentText this.form.approvalOpinion = this.approvalOpinion @@ -2980,6 +2981,7 @@ export default { this.$message.success(res.message) } this.isSubmit = false + this.saveLoading = false }) } } From ebda3b0beae45355385781316a13013e232840e4 Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 6 Nov 2023 11:20:32 +0800 Subject: [PATCH 15/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=A0=87?= =?UTF-8?q?=E5=87=86=E8=B0=83=E7=A0=94=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzdy/step1.vue | 7 ++++++- .../pages/creatProcess/bzdy/step2.vue | 12 ++++++++++-- .../pages/creatProcess/bzdy/step3.vue | 15 +++++++++++++-- .../pages/creatProcess/bzdy/step4.vue | 10 ++++++++++ .../pages/creatProcess/bzdy/step5.vue | 11 ++++++++++- .../pages/creatProcess/bzdy/step6.vue | 10 ++++++++++ .../pages/creatProcess/bzdy/step7.vue | 5 +++++ .../pages/creatProcess/bzdy/step8.vue | 6 +++++- .../pages/creatProcess/bzdy/step9.vue | 6 +++++- 9 files changed, 74 insertions(+), 8 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index 880c31566..c1b047266 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -542,6 +542,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) @@ -556,8 +557,9 @@ export default { this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, handleSubmit() { @@ -566,6 +568,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, @@ -597,9 +600,11 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } else { this.isSubmit = false + this.saveLoading = 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 82015cf43..c824bbae5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue @@ -256,6 +256,8 @@ this.drawerModal = true }, checkedRole (data) { + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -270,6 +272,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -324,6 +329,7 @@ }, handleSave() { this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -331,16 +337,17 @@ commentText2: this.commentText2, })) 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 var json = this.json json.commentText = this.commentText2 json.responUserList = this.form.responUserList @@ -355,6 +362,7 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } else { return this.$message.warning('请完善基础信息') diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index db0421945..494e98a73 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -328,6 +328,8 @@ this.drawerModal = true }, checkedRole (data) { + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -342,6 +344,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -429,6 +434,7 @@ }, handleSave() { this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -437,15 +443,16 @@ commentText3: this.commentText3, })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, // 接受按钮 handleAccept(){ this.isSubmit = true + this.saveLoading = true execTask({ todoId: this.todoId // 当前节点ID }).then(res => { @@ -453,6 +460,8 @@ this.$message.success('接收成功') this.$router.push('/processCenter') } + }).finally(() => { + this.saveLoading = false this.isSubmit = false }) }, @@ -461,6 +470,7 @@ if (valid) { this.json.dyhz = this.form.dyhz this.isSubmit = true + this.saveLoading = true var json = this.json json.commentText = this.commentText3 json.fileId = this.form.fileId @@ -476,6 +486,7 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } else { return this.$message.warning('请完善基础信息') diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index d9066941d..879c08cd3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -210,6 +210,7 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" + :isSubmitBack="isSubmit" @submit="handleSubmit" show-back @back="handleSubmitNo" @@ -304,6 +305,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, // 委托人 @@ -318,6 +321,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 @@ -355,6 +361,7 @@ }, handleSubmit() { // 同意 this.isSubmit = true + this.saveLoading = true var json = this.json json.actionFlag = 0 json.commentText = this.commentText4 @@ -368,11 +375,13 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) }, handleSubmitNo() { if (this.commentText4) { this.isSubmit = true + this.saveLoading = true var json = this.json json.actionFlag = 1 json.commentText = this.commentText4 @@ -386,6 +395,7 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } else { this.$message.warning('请输入审批意见') diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index 97226269f..cac9b12f3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -299,6 +299,8 @@ this.drawerModal = true }, checkedRole (data) { + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -313,6 +315,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -387,6 +392,7 @@ }, handleSave() { this.saveLoading = true + this.isSubmit = true let json = this.form json.responUserList = this.tableData this.form.docUser = this.newDocUser @@ -399,14 +405,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 @@ -423,6 +431,7 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue index c9a454d2a..b760fc7d3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue @@ -202,6 +202,7 @@ @back="handleSubmitNo" :submitLoading="isSubmit" :saveLoading="saveLoading" + :isSubmitBack="isSubmit" show-transfer @transfer="handleTransfer" @submit="handleSubmit" @@ -294,6 +295,8 @@ this.drawerModal = true }, checkedRole (data) { + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -308,6 +311,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -382,6 +388,7 @@ }, handleSubmit() { this.isSubmit = true + this.saveLoading = true var json = this.json json.actionFlag = 0 json.commentText = this.commentText6 @@ -395,11 +402,13 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) }, handleSubmitNo() { if (this.commentText6) { this.isSubmit = true + this.saveLoading = true var json = this.json json.actionFlag = 1 json.commentText = this.commentText6 @@ -413,6 +422,7 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } else { this.$message.warning('请输入审批意见') diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue index c57b24558..f3c74aad9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue @@ -201,6 +201,8 @@ approval @back="handleSubmitNo" :submitLoading="isSubmit" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" show-transfer @transfer="handleTransfer" @submit="handleSubmit" @@ -293,6 +295,7 @@ this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -307,6 +310,8 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue index cd033ce64..c7034cdfd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue @@ -199,7 +199,8 @@ show-submit approval :submitLoading="isSubmit" - :saveLoading="saveLoading" + :saveLoading="isSubmit" + :isSubmitBack="isSubmit" @submit="handleSubmit" show-back show-transfer @@ -294,6 +295,7 @@ this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -308,6 +310,8 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue index a2be9e220..d5789c8e0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -233,7 +233,8 @@ approval @back="handleSubmitNo" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :saveLoading="isSubmit" + :isSubmitBack="isSubmit" show-transfer @transfer="handleTransfer" @submit="handleSubmit" @@ -337,6 +338,7 @@ this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -351,6 +353,8 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 From 81862e012a8b6998af266165ba58cf3c07fdf61c Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 6 Nov 2023 11:51:10 +0800 Subject: [PATCH 16/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B8=85=E5=8D=95=E5=8F=91=E5=B8=83/=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=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 }); }, //选择标准取消事件 From 3587fc859ed850ab384ae804862dd3ae35e8631b Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 6 Nov 2023 13:23:09 +0800 Subject: [PATCH 17/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=A0=87?= =?UTF-8?q?=E5=87=86=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzjd/step1.vue | 9 +++++++-- .../processCenter/pages/creatProcess/bzjd/step2.vue | 12 ++++++++++-- .../processCenter/pages/creatProcess/bzjd/step3.vue | 11 ++++++++++- .../processCenter/pages/creatProcess/bzjd/step4.vue | 6 +++++- .../processCenter/pages/creatProcess/bzjd/step5.vue | 6 +++++- .../pages/creatProcess/bzjd/step6-1.vue | 6 +++++- .../processCenter/pages/creatProcess/bzjd/step6.vue | 6 +++++- 7 files changed, 47 insertions(+), 9 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index f92c3a402..e663cd815 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -1056,6 +1056,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) @@ -1069,11 +1070,11 @@ export default { sarType: this.sarType })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, handleSubmit() { @@ -1129,6 +1130,7 @@ export default { this.$message.warning('请选择责任人') } else { this.isSubmit = true + this.saveLoading = true this.$http.post('lawss/activiti/startProcessRollBack', { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, @@ -1164,10 +1166,13 @@ export default { } this.$router.push('/processCenter') } + this.isSubmit = false + this.saveLoading = false }) } else { this.$message.warning('流程启动失败') this.isSubmit = false + this.saveLoading = false } }) } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 5f35d1769..52292c875 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -332,6 +332,8 @@ this.drawerModal = true }, checkedRole (data) { + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -346,6 +348,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 点击跳转标准详情 @@ -454,6 +459,7 @@ }, handleSave() { this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -464,10 +470,10 @@ standInData: this.sarType })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, handleSubmit() { @@ -483,6 +489,7 @@ this.$message.warning('请选择执行人') } else { this.isSubmit = true + this.saveLoading = true var json = this.json json.itemList = this.itemList json.commentText = this.commentText2 @@ -496,6 +503,7 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } } else { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index f9dbbbb53..548446a2a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -714,6 +714,8 @@ this.drawerModal = true }, checkedRole (data) { + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -728,6 +730,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -831,6 +836,7 @@ }, handleSave() { this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -844,7 +850,8 @@ saveTaskForPub(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - }).catch(e => { + }).finally(() => { + this.isSubmit = false this.saveLoading = false }) }, @@ -918,6 +925,7 @@ this.$message.warning('请选择责任人') } else { this.isSubmit = true + this.saveLoading = true var json = this.json json.commentText = this.commentText3 json.itemList = this.itemList @@ -932,6 +940,7 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } } else { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 28824f9ec..eb0cb4c13 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -256,7 +256,8 @@ { + this.isSubmit = false }) }, // 点击跳转标准详情 diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index 15738aa9a..b63ddc292 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -255,7 +255,8 @@ { + this.isSubmit = false }) }, // 点击跳转标准详情 diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue index bdd588f52..b0931bab0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue @@ -258,7 +258,8 @@ { + this.isSubmit = false }) }, // 点击跳转标准详情 diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index 0d663e0b2..b39b0cda4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -258,7 +258,8 @@ { + this.isSubmit = false }) }, // 点击跳转标准详情 From ff5286c4eb3e56b68daf14e2373316218c511e74 Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 6 Nov 2023 14:03:31 +0800 Subject: [PATCH 18/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzpg/step1.vue | 20 ++++++++++++++----- .../pages/creatProcess/bzpg/step2.vue | 9 +++++---- .../pages/creatProcess/bzpg/step3.vue | 15 +++++++++----- .../pages/creatProcess/bzpg/step4.vue | 10 +++++++--- .../pages/creatProcess/bzpg/step5.vue | 16 ++++++++++++--- .../pages/creatProcess/bzpg/step6.vue | 9 +++++---- .../pages/creatProcess/bzpg/step7.vue | 10 +++++++--- .../pages/creatProcess/bzpg/step8-2.vue | 10 +++++++--- .../pages/creatProcess/bzpg/step8.vue | 9 +++++++-- 9 files changed, 76 insertions(+), 32 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index 0db4bd42c..743550ab1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -923,6 +923,7 @@ export default { handleSave() { if(!this.submitFlag){ this.saveLoading = true; + this.isSubmit = true this.listForm.dataList = this.dataList let _formData = new FormData(); _formData.append("id", this.bpnId || ""); @@ -936,13 +937,14 @@ export default { commentText: this.commentText })); saveTaskFirst(_formData).then(res => { - this.saveLoading = false; this.$message.success("保存成功"); - }).catch(e => { + }).finally(() => { this.saveLoading = false; + this.isSubmit = false }); }else{ this.saveLoading = true; + this.isSubmit = true this.listForm.dataList = this.dataList let _formData = new FormData(); _formData.append("id", this.bpnId || ""); @@ -955,11 +957,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 }); } }, @@ -977,7 +979,6 @@ export default { } }) if(peopleFlag){ - this.isSubmit = true; this.listForm.dataList = this.dataList; this.listForm.commentText = this.commentText; let json = Object.assign(this.listForm, this.roleForm); @@ -986,6 +987,8 @@ export default { if (valid) { this.$refs["roleForm"].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, @@ -1020,7 +1023,11 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false }); + } else { + this.isSubmit = false + this.saveLoading = false } }); } else { @@ -1038,6 +1045,8 @@ export default { if (valid) { this.$refs["roleForm"].validate((valid) => { if (valid) { + this.saveLoading = true + this.isSubmit = true let specialJson = { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, @@ -1076,6 +1085,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false }); } else { this.isSubmit = false; diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue index a0a96e66b..aaa30b670 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue @@ -202,9 +202,9 @@ show-back show-transfer show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :saveLoading="isSubmit" + :isSubmitBack="isSubmit" :approval="true" @transfer="handleTransfer" @back="beforeBack" @@ -359,14 +359,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('调整成功') @@ -375,6 +374,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue index b3c58022c..c19a00e95 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue @@ -379,7 +379,6 @@ show-save show-transfer show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" :saveLoading="saveLoading" :approval="true" @@ -746,6 +745,7 @@ export default { this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.isSubmit = true; + this.saveLoading = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -758,6 +758,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); }else{ @@ -769,6 +770,7 @@ export default { //保存 handleSave() { this.saveLoading = true; + this.isSubmit = true // this.listForm.dataList = this.dataList; let _formData = new FormData(); _formData.append("id", this.bpnId || ""); @@ -780,11 +782,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; }); }, checkedRole2(data) { @@ -795,14 +797,14 @@ export default { }, //确认转办 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("调整成功"); @@ -811,6 +813,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false; + this.isSubmit = false; }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue index a97671a00..d32e2a941 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue @@ -267,7 +267,6 @@ { }); } }, //确认转办 checkedRole (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('调整成功') @@ -484,6 +485,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue index 65d19c8b2..9d9cb67bd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue @@ -448,7 +448,6 @@ :show-submit="submitShow" :show-confirm="acceptShow" :submitLoading="isSubmit" - :transfer-loading="isTransfer" :saveLoading="saveLoading" @save="handleSave" @transfer="handleTransfer" @@ -697,7 +696,8 @@ export default { }, //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -713,6 +713,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -840,6 +843,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true let _formData = new FormData(); this.listForm.dataList = this.dataList; _formData.append("id", this.bpnId || ""); @@ -853,13 +857,15 @@ export default { this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { + }).finally(() => { this.saveLoading = false; + this.isSubmit = false }); }, // 接受按钮 handleAccept(){ this.isSubmit = true + this.saveLoading = true; execTask({ todoId: this.todoId // 当前节点ID }).then(res => { @@ -867,6 +873,8 @@ export default { this.$message.success('接收成功') this.$router.push('/processCenter') } + }).finally(() => { + this.saveLoading = false; this.isSubmit = false }) }, @@ -917,6 +925,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, @@ -929,6 +938,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue index 0c8193924..e8fab95de 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue @@ -352,8 +352,8 @@ show-submit show-transfer :submitLoading="isSubmit" - :saveLoading="saveLoading" - :transfer-loading="isTransfer" + :saveLoading="isSubmit" + :isSubmitBack="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -477,14 +477,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('调整成功') @@ -493,6 +492,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue index 982972053..e70736efb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue @@ -361,7 +361,6 @@ show-transfer :submitLoading="isSubmit" :saveLoading="saveLoading" - :transfer-loading="isTransfer" :approval="true" @transfer="handleTransfer" @submit="handleSubmit" @@ -490,14 +489,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('调整成功') @@ -506,6 +505,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -633,6 +635,7 @@ export default { this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.isSubmit = true + this.saveLoading = false this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -645,6 +648,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }, e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue index 57cb4b6be..6fd0830ea 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue @@ -371,7 +371,6 @@ show-transfer :submitLoading="isSubmit" :saveLoading="saveLoading" - :transfer-loading="isTransfer" :approval="true" @transfer="handleTransfer" @submit="handleSubmit" @@ -502,14 +501,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('调整成功') @@ -518,6 +517,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -646,6 +648,7 @@ export default { this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.isSubmit = true + this.saveLoading = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -658,6 +661,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }, e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue index 226a842e4..505be2934 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue @@ -361,7 +361,6 @@ show-transfer :submitLoading="isSubmit" :saveLoading="saveLoading" - :transfer-loading="isTransfer" :approval="true" @transfer="handleTransfer" @submit="handleSubmit" @@ -490,7 +489,8 @@ export default { }, //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -506,6 +506,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -633,6 +636,7 @@ export default { this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.isSubmit = true + this.saveLoading = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -645,6 +649,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }, e => { }); From 5bfda5feca253d01e1bcb04ddcec6dec94e049b3 Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 6 Nov 2023 15:05:56 +0800 Subject: [PATCH 19/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?-=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step1.vue | 10 ++++++++-- .../pages/creatProcess/xmpg/step2.vue | 18 +++++++++++------ .../pages/creatProcess/xmpg/step3.vue | 20 +++++++++++++------ .../pages/creatProcess/xmpg/step4.vue | 11 ++++++---- .../pages/creatProcess/xmpg/step5-1.vue | 8 ++++---- .../pages/creatProcess/xmpg/step5.vue | 8 ++++---- .../pages/creatProcess/xmpg2/step1-1.vue | 10 ++++++++-- .../pages/creatProcess/xmpg2/step1.vue | 10 ++++++++-- .../pages/creatProcess/xmpg2/step10.vue | 11 ++++++---- .../pages/creatProcess/xmpg2/step11.vue | 9 +++++---- .../pages/creatProcess/xmpg2/step12.vue | 9 ++++++--- .../pages/creatProcess/xmpg2/step2.vue | 11 ++++++---- .../pages/creatProcess/xmpg2/step3.vue | 19 +++++++++++------- .../pages/creatProcess/xmpg2/step4.vue | 19 +++++++++++------- .../pages/creatProcess/xmpg2/step5.vue | 17 +++++++++++----- .../pages/creatProcess/xmpg2/step6.vue | 18 ++++++++++++----- .../pages/creatProcess/xmpg2/step7.vue | 11 ++++++---- .../pages/creatProcess/xmpg2/step8.vue | 11 ++++++---- .../pages/creatProcess/xmpg2/step9.vue | 11 ++++++---- 19 files changed, 160 insertions(+), 81 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 2275cefdf..00b7745c2 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -814,6 +814,7 @@ export default { //流程保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true this.listForm.dataList = this.dataList let _formData = new FormData(); _formData.append("id", this.bpnId || ""); @@ -826,11 +827,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 }); }, //流程提交事件 @@ -858,6 +859,7 @@ export default { this.$refs["roleForm"].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, @@ -891,7 +893,11 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false }); + } else { + this.saveLoading = false + this.isSubmit = false; } }); } else { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 5746cc13e..8faf37b67 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -141,7 +141,7 @@ 流程列表加载中
- @@ -219,7 +219,8 @@ export default { methods: { //确认转办 checkedTransferRole(data) { - this.assigneeNewLoading = true; + this.saveLoading = true; + this.isSubmit = true; changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -235,6 +236,9 @@ export default { } else { this.$message.warning(res.message); } + }).finally(() => { + this.saveLoading = false; + this.isSubmit = false; }); }, // 请求转换流程图 @@ -423,6 +427,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true let _formData = new FormData(); _formData.append("id", this.bpnId || ""); _formData.append("prcType", "6"); @@ -432,11 +437,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 }); }, //提交事件 @@ -449,7 +454,6 @@ export default { dataChildren.forEach((item, index) => { dataListChildren = dataListChildren.concat(item); }); - this.isSubmit = true; this.listForm.breakdownList.map(item => { if(item.termsConditions){ item.termsConditions = '' @@ -461,9 +465,10 @@ export default { const json = JSON.stringify(this.listForm); if(this.nodeList.length == 0){ this.$message.warning('请先分发责任人') - this.isSubmit = false; return } + this.isSubmit = true; + this.saveLoading = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -476,6 +481,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false }, e => { }); }, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 80f1b663c..b566a9673 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -376,7 +376,6 @@ :show-submit="submitShow" :show-confirm="acceptShow" :submitLoading="isSubmit" - :transfer-loading="isTransfer" :saveLoading="saveLoading" @save="handleSave" @transfer="handleTransfer" @@ -609,14 +608,14 @@ export default { methods: { //确认转办 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("调整成功"); @@ -625,6 +624,9 @@ export default { } else { this.$message.warning(res.message); } + }).finally(() => { + this.saveLoading = false; + this.isSubmit = false }); }, // 请求转换流程图 @@ -903,6 +905,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true let _formData = new FormData(); _formData.append("id", this.bpnId || ""); _formData.append("prcType", "6"); @@ -912,16 +915,17 @@ 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 }); }, // 接受按钮 handleAccept() { this.isSubmit = true; + this.saveLoading = true; execTask({ todoId: this.todoId // 当前节点ID }).then(res => { @@ -929,7 +933,9 @@ export default { this.$message.success("接收成功"); this.$router.push("/processCenter"); } - this.isSubmit = false; + }).finally(() => { + this.saveLoading = false; + this.isSubmit = false }); }, handlePrice() { @@ -985,6 +991,7 @@ export default { } }); this.isSubmit = true; + this.saveLoading = true; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { @@ -999,6 +1006,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index bd2b139f2..08cb894ea 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -270,8 +270,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :saveLoading="isSubmit" + :isSubmitBack="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -337,14 +337,13 @@ export default { methods: { //确认转办 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('调整成功') @@ -353,6 +352,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 @@ -514,6 +515,7 @@ export default { this.listForm.passFlag = "1"; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -525,6 +527,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false; }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue index 89b2528c9..78fd086c5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue @@ -269,8 +269,7 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :saveLoading="isSubmit" :approval="true" @transfer="handleTransfer" @submit="handleSubmit" @@ -336,14 +335,13 @@ export default { methods: { //确认转办 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('调整成功') @@ -352,6 +350,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index fdf7f409a..aaa311f31 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -269,8 +269,7 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :saveLoading="isSubmit" :approval="true" @transfer="handleTransfer" @submit="handleSubmit" @@ -334,14 +333,13 @@ export default { methods: { //确认转办 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('调整成功') @@ -350,6 +348,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index 317eab843..80087a072 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -575,6 +575,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); @@ -586,11 +587,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 }); }, //流程提交事件 @@ -617,6 +618,7 @@ export default { this.$refs["roleForm"].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, @@ -650,7 +652,11 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }); + } else { + this.saveLoading = false; + this.isSubmit = false; } }); } else { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 3fbf3e7f6..25d904605 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -681,6 +681,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); @@ -692,11 +693,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 }); }, //流程提交事件 @@ -723,6 +724,7 @@ export default { this.$refs["roleForm"].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, @@ -755,8 +757,12 @@ export default { } this.$router.push("/processCenter"); } + this.saveLoading = false this.isSubmit = false; }); + } else { + this.saveLoading = false + this.isSubmit = false } }); } else { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue index c967540c8..a1e70fd5e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -293,8 +293,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -360,14 +360,13 @@ export default { methods: { //确认转办 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('调整成功') @@ -376,6 +375,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 @@ -516,6 +517,7 @@ export default { this.listForm.bzFlag = "2"; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -527,6 +529,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue index b96666714..4b2b60bfe 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue @@ -292,8 +292,8 @@ show-submit show-transfer :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @submit="handleSubmit" @transfer="handleTransfer" @@ -358,14 +358,13 @@ export default { methods: { //确认转办 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('调整成功') @@ -374,6 +373,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue index 10d134bd6..8c55b76ae 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -293,7 +293,7 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" + :isSubmitBack="isSubmit" :saveLoading="saveLoading" :approval="true" @back="beforeBack" @@ -360,14 +360,13 @@ export default { methods: { //确认转办 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('调整成功') @@ -376,6 +375,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 @@ -516,6 +517,7 @@ export default { this.listForm.dlFlag = "2"; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -527,6 +529,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false; }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue index e07c3d73f..8d0dc93ef 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue @@ -196,8 +196,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :saveLoading="isSubmit" + :isSubmitBack="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -260,14 +260,13 @@ export default { methods: { //确认转办 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('调整成功') @@ -276,6 +275,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 @@ -367,6 +368,7 @@ export default { this.listForm.BZFlag = "2"; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -378,6 +380,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue index 18180843a..2953f322e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue @@ -207,7 +207,6 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" :saveLoading="saveLoading" @save="handleSave" @transfer="handleTransfer" @@ -290,14 +289,14 @@ export default { methods: { //确认转办 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('调整成功') @@ -306,6 +305,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -428,6 +430,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true let _formData = new FormData(); _formData.append("id", this.bpnId || ""); _formData.append("prcType", "6"); @@ -437,12 +440,12 @@ export default { commentText: this.commentText })); saveTaskForPub(_formData).then(res => { - this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { - this.saveLoading = false; - }); + }).finally(() => { + this.saveLoading = false + this.isSubmit = false + }) }, //提交事件 handleSubmit() { @@ -450,6 +453,7 @@ export default { this.$message.warning("请选择架构经理"); } else { this.isSubmit = true; + this.saveLoading = true; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { @@ -464,6 +468,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue index 7a6509841..784589888 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue @@ -215,7 +215,6 @@ show-submit show-transfer :submitLoading="isSubmit" - :transfer-loading="isTransfer" :saveLoading="saveLoading" @save="handleSave" @transfer="handleTransfer" @@ -299,14 +298,14 @@ export default { methods: { //确认转办 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('调整成功') @@ -315,6 +314,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -431,6 +433,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true; let _formData = new FormData(); _formData.append("id", this.bpnId || ""); _formData.append("prcType", "6"); @@ -440,12 +443,12 @@ export default { commentText: this.commentText })); saveTaskForPub(_formData).then(res => { - this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { - this.saveLoading = false; - }); + }).finally(() => { + this.saveLoading = false + this.isSubmit = false + }) }, //提交事件 handleSubmit() { @@ -457,6 +460,7 @@ export default { }); if (this.peopleFlag === true) { this.isSubmit = true; + this.saveLoading = true; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { @@ -471,6 +475,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); } else { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index b31834a2e..d586d6d6f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -131,7 +131,7 @@ 流程列表加载中 - @@ -209,14 +209,14 @@ export default { methods: { //确认转办 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("调整成功"); @@ -225,7 +225,10 @@ export default { } else { this.$message.warning(res.message); } - }); + }).finally(() => { + this.saveLoading = false; + this.isSubmit = false; + }) }, // 请求转换流程图 processNum(row) { @@ -373,6 +376,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true let _formData = new FormData(); _formData.append("id", this.bpnId || ""); _formData.append("prcType", "6"); @@ -385,8 +389,9 @@ export default { this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { + }).finally(() => { this.saveLoading = false; + this.isSubmit = false; }); }, //提交事件 @@ -401,6 +406,7 @@ export default { dataListChildren = dataListChildren.concat(item); }); this.isSubmit = true; + this.saveLoading = true; this.listForm.commentText = this.commentText; this.listForm.children = dataListChildren; this.listForm.dataList = this.dataList; @@ -419,6 +425,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); // }else { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 1f0269507..9e586f876 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -321,7 +321,6 @@ :show-submit="submitShow" :show-confirm="acceptShow" :submitLoading="isSubmit" - :transfer-loading="isTransfer" :saveLoading="saveLoading" @save="handleSave" @transfer="handleTransfer" @@ -518,14 +517,14 @@ export default { methods: { //确认转办 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("调整成功"); @@ -534,6 +533,9 @@ export default { } else { this.$message.warning(res.message); } + }).finally(() => { + this.saveLoading = false; + this.isSubmit = false; }); }, // 请求转换流程图 @@ -764,6 +766,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true let _formData = new FormData(); _formData.append("id", this.bpnId || ""); _formData.append("prcType", "6"); @@ -773,16 +776,17 @@ 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; }); }, // 接受按钮 handleAccept() { this.isSubmit = true; + this.saveLoading = true; execTask({ todoId: this.todoId // 当前节点ID }).then(res => { @@ -790,6 +794,8 @@ export default { this.$message.success("接收成功"); this.$router.push("/processCenter"); } + }).finally(() => { + this.saveLoading = false; this.isSubmit = false; }); }, @@ -824,6 +830,7 @@ export default { } }) this.isSubmit = true; + this.saveLoading = true; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { @@ -838,6 +845,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue index 586efd7db..c2a2af9cb 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue @@ -251,8 +251,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -318,14 +318,13 @@ export default { methods: { //确认转办 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('调整成功') @@ -334,6 +333,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 @@ -451,6 +452,7 @@ export default { this.listForm.ffFlag = "2"; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -462,6 +464,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false; }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue index 99393bbe3..b614a6f45 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue @@ -291,8 +291,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -358,14 +358,13 @@ export default { methods: { //确认转办 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('调整成功') @@ -374,6 +373,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 @@ -514,6 +515,7 @@ export default { this.listForm.jgFlag = "2"; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -525,6 +527,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false; }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue index 5ec19a0c2..9c25ac827 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue @@ -293,8 +293,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -360,14 +360,13 @@ export default { methods: { //确认转办 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('调整成功') @@ -376,6 +375,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 @@ -516,6 +517,7 @@ export default { this.listForm.gcFlag = "2"; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -527,6 +529,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false; }, e => { }); } From 7cbd4aa7280f365982e568563cf720316b3201bc Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 6 Nov 2023 15:34:13 +0800 Subject: [PATCH 20/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmqdqr/step1.vue | 12 +++++++--- .../pages/creatProcess/xmqdqr/step2.vue | 21 +++++++++++----- .../pages/creatProcess/xmqdqr/step3.vue | 24 ++++++++++++------- .../pages/creatProcess/xmqdqr/step4-1.vue | 17 +++++++++---- .../pages/creatProcess/xmqdqr/step4.vue | 18 +++++++++----- 5 files changed, 64 insertions(+), 28 deletions(-) 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 => { }); }, From 4ff2696b869b6783cadf2d10164c6806a2a3b1ea Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 6 Nov 2023 16:03:02 +0800 Subject: [PATCH 21/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=9C=AA?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E9=A1=B9=E6=95=B4=E6=94=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step1.vue | 21 +++++++++---- .../pages/creatProcess/wfhxzg/step2.vue | 24 +++++++-------- .../pages/creatProcess/wfhxzg/step3-1.vue | 24 ++++++++------- .../pages/creatProcess/wfhxzg/step3.vue | 26 ++++++++-------- .../pages/creatProcess/wfhxzg/step4.vue | 30 +++++++++---------- .../pages/creatProcess/wfhxzg/step5.vue | 13 ++++---- 6 files changed, 75 insertions(+), 63 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index a50cbe1de..480ac7861 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -608,6 +608,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) @@ -619,12 +620,12 @@ export default { commentText: this.commentText })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false - }) + }).finally(() => { + this.isSubmit = false; + this.saveLoading = false; + }); }, // 提交按钮 handleSubmit() { @@ -650,6 +651,7 @@ export default { this.$refs['roleForm'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true let paramsInfo = new FormData() // paramsInfo.append('id', this.bpnId || '') paramsInfo.append('createUser', this.$store.getters.userInfo.userId) @@ -680,7 +682,13 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false - }) + }).finally(() => { + this.isSubmit = false; + this.saveLoading = false; + }); + }).catch(e => { + this.isSubmit = false; + this.saveLoading = false; }) } }) @@ -698,6 +706,8 @@ export default { commentText: this.commentText } }; + this.isSubmit = true + this.saveLoading = true this.$http.post("lawss/activiti/completeTaskNew", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, @@ -719,6 +729,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }); } else { this.isSubmit = false; diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index 5ae2af95e..c76e5acaf 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -151,8 +151,8 @@ show-transfer show-back :submitLoading="isSubmit" - :saveLoading="saveLoading" - :transferLoading="turnLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" @back="beforeBack" @transfer="handleTurnTo" @save="handleSave" @@ -322,7 +322,7 @@ export default { }, // 保存按钮 handleSave() { - this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -331,11 +331,10 @@ export default { commentInfo: this.commentInfo })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(e => { + this.isSubmit = false }) }, //驳回按钮 @@ -370,13 +369,13 @@ export default { params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) params.set('taskIds', this.taskIds) + this.isSubmit = true completeTask(params).then(res => { if(res.success === true) { this.$message.success('提交成功') this.$router.push("/processCenter"); } - this.isSubmit = false - }).catch(e => { + }).finally(() => { this.isSubmit = false }) } @@ -384,7 +383,6 @@ export default { }, // 提交按钮 handleSubmit() { - this.isSubmit = true let zqa = new Map(); for (let lastDataListElement of this.dataList) { let a = zqa.get(lastDataListElement.dutyPeopleInfoId) @@ -420,20 +418,20 @@ export default { params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) params.set('taskIds', this.taskIds) + this.isSubmit = true completeTask(params).then(res => { if(res.success === true) { this.$message.success('提交成功') this.$router.push("/processCenter"); } - this.isSubmit = false - }).catch(e => { + }).finally(e => { this.isSubmit = false }) }, drawerCheck (data) { if (this.drawerTitle === '转办处理人') { - this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -447,6 +445,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) } else { this.roleRow = data[0] diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3-1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3-1.vue index 31d8c505a..e8437cbf9 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3-1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3-1.vue @@ -154,8 +154,8 @@ show-submit show-transfer :submitLoading="isSubmit" - :saveLoading="saveLoading" - :transferLoading="turnLoading" + :saveLoading="isSubmit" + :isSubmitBack="isSubmit" @transfer="handleTurnTo" @back="handleSubmitNo" @save="handleSave" @@ -366,11 +366,14 @@ export default { params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) params.set('taskIds', this.taskIds) + this.isSubmit = true completeTask(params).then(res => { if (res.success) { this.$message.success('驳回成功') this.$router.push('/processCenter') } + }).finally(() => { + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') @@ -407,7 +410,7 @@ export default { for(let item of zqa) { list.push(item[1]) } - this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -416,16 +419,14 @@ export default { textarea: this.textarea })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(e => { + this.isSubmit = false }) }, // 提交按钮 handleSubmit() { - this.isSubmit = true let flag=false this.dataList.forEach(item => { if (item.dutyPeople === '') { @@ -462,20 +463,20 @@ export default { params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) params.set('taskIds', this.taskIds) + this.isSubmit = true completeTask(params).then(res => { if (res.success === true) { this.$message.success('提交成功') this.$router.push("/processCenter"); } - this.isSubmit = false - }).catch(e => { + }).finally(e => { this.isSubmit = false }) }, drawerCheck (data) { if (this.drawerTitle === '转办处理人') { - this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -483,12 +484,13 @@ export default { pId: this.pId // 流程实例 }).then(res =>{ if (res.success) { - this.turnLoading = false this.$message.success('调整成功') this.$router.push("/processCenter") } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) } else { this.roleForm = data[0] diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index 94509d2a6..93fd4be91 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -153,8 +153,8 @@ show-submit show-transfer :submitLoading="isSubmit" - :saveLoading="saveLoading" - :transferLoading="turnLoading" + :saveLoading="isSubmit" + :isSubmitBack="isSubmit" @transfer="handleTurnTo" @back="handleSubmitNo" @save="handleSave" @@ -341,12 +341,15 @@ export default { params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) params.set('taskIds', this.taskIds) + this.isSubmit = true completeTask(params).then(res => { if (res.success) { this.$message.success('驳回成功') this.$router.push('/processCenter') } - }) + }).finally(() => { + this.isSubmit = false; + }); } else { this.$message.warning('请输入反馈意见') } @@ -382,7 +385,7 @@ export default { for(let item of zqa) { list.push(item[1]) } - this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -391,16 +394,14 @@ export default { textarea: this.textarea })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(e => { + this.isSubmit = false }) }, // 提交按钮 handleSubmit() { - this.isSubmit = true let flag=false this.dataList.forEach(item => { if (item.dutyPeople === '') { @@ -437,20 +438,20 @@ export default { params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) params.set('taskIds', this.taskIds) + this.isSubmit = true completeTask(params).then(res => { if (res.success === true) { this.$message.success('提交成功') this.$router.push("/processCenter"); } - this.isSubmit = false - }).catch(e => { + }).finally(e => { this.isSubmit = false }) }, drawerCheck (data) { if (this.drawerTitle === '转办处理人') { - this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -458,12 +459,13 @@ export default { pId: this.pId // 流程实例 }).then(res =>{ if (res.success) { - this.turnLoading = false this.$message.success('调整成功') this.$router.push("/processCenter") } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) } else { this.roleForm = data[0] diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index b74220316..7e38d5f6d 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -155,8 +155,7 @@ :show-submit="submitShow" :show-confirm="acceptShow" :submitLoading="isSubmit" - :saveLoading="saveLoading" - :transferLoading="turnLoading" + :saveLoading="isSubmit" @transfer="handleTurnTo" @save="handleSave" @submit="handleSubmit" @@ -389,21 +388,21 @@ export default { window.open(routeUrl.href, '_blank') }, drawerCheck (data) { - this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.userId, // 委托人 pId: this.pId // 流程实例 }).then(res =>{ - this.isSubmit = true if (res.success) { - this.turnLoading = false this.$message.success('调整成功') this.$router.push("/processCenter") } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, @@ -429,7 +428,7 @@ export default { for(let item of zqa) { list.push(item[1].standardInfoList) } - this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -438,11 +437,10 @@ export default { commentInput: this.commentInput })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(e => { + this.isSubmit = false }) }, // 接受按钮 @@ -455,12 +453,12 @@ export default { this.$message.success('接收成功') this.$router.push('/processCenter') } - this.isSubmit = false - }) + }).finally(() => { + this.isSubmit = false; + }); }, // 提交按钮 handleSubmit() { - this.isSubmit = true let flag = false this.dataList.forEach(item => { if (item.fileText.length === 0) { @@ -479,15 +477,15 @@ export default { params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) params.set('taskIds', this.taskIds) + this.isSubmit = true completeTask(params).then(res => { if(res.success === true) { this.$message.success('提交成功') this.$router.push("/processCenter"); } - this.isSubmit = false - }).catch(e => { - this.isSubmit = false - }) + }).finally(() => { + this.isSubmit = false; + }); }, //未整改项抽屉中的查询按钮 diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 9af768425..b32718f2f 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -135,8 +135,7 @@ show-transfer @back="handleSubmitNo" :submitLoading="isSubmit" - :isSubmitBack="backLoading" - :transferLoading="turnLoading" + :isSubmitBack="isSubmit" @transfer="handleTurnTo" @submit="handleSubmit" submitBTNText="同意" @@ -312,7 +311,7 @@ export default { }) }, drawerCheck (data) { - this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -320,12 +319,13 @@ export default { pId: this.pId // 流程实例 }).then(res =>{ if (res.success) { - this.turnLoading = false this.$message.success('调整成功') this.$router.push("/processCenter") } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, @@ -335,13 +335,13 @@ export default { this.drawerTitle = '转办处理人' }, handleSubmitNo() { - this.backLoading = true if (this.commentText) { var json = { responUserList: this.dataList, actionFlag: 1, commentText: this.commentText } + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -350,12 +350,11 @@ export default { if (res.success) { this.$message.success('驳回成功') this.$router.push('/processCenter') - this.backLoading = false } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') - this.backLoading = false } }, //未整改项抽屉中的查询按钮 From 3af2c8c7e26b134c7f582d050028449ce73cc535 Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 6 Nov 2023 16:26:44 +0800 Subject: [PATCH 22/70] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2-=E5=8F=91=E5=B8=83=E8=8A=82=E7=82=B9-=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E6=97=A5=E6=9C=9F-=E4=BF=AE=E6=94=B9=E6=97=B6?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=8E=9F=E6=9D=A5=E7=9A=84=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=EF=BC=8C=E5=88=B6=E5=AE=9A=E4=BF=AE=E8=AE=A2=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/qbrk-product/step13.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index d9b1e3739..b735769b7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -2693,7 +2693,9 @@ this.form.topId = this.pId this.form.prcNum = this.prcNum this.form.prcName = this.prcName - this.form.issueTime = this.dateFormatter() + if (this.form.standStatus !== '3') { + this.form.issueTime = this.dateFormatter() + } this.form['id'] = item.id this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS']) this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS']) From e991b4ace0ac0fc6c336c7b5a5a7ee4f5659fd44 Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 6 Nov 2023 16:34:15 +0800 Subject: [PATCH 23/70] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E6=95=B0=E5=B0=8F=E7=A6=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index aff365ccc..57ba4a530 100644 --- a/src/App.vue +++ b/src/App.vue @@ -10,7 +10,7 @@ - + @@ -96,6 +96,7 @@ import {mapGetters, mapState} from 'vuex' import {webLoginType, ssoLogoutUrlDev} from '@/sysConfig' import customerService from "@/components/customerService"; + import isMobile from "./store/isMobile"; export default { name: 'App', @@ -239,6 +240,9 @@ userAvator() { return this.$store.getters.userInfo.avator || require('@/assets/images/avator_default.png') }, + customerServiceShow () { + return !isMobile() + }, ...mapGetters([ 'getWebSocketList', 'getTheme', 'getMenuList' ]), From 1cb34d7cff5aa1abb7bddc87a5fe3db0ba68014e Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 6 Nov 2023 17:14:27 +0800 Subject: [PATCH 24/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E5=A4=96?= =?UTF-8?q?=E9=83=A8=E6=A0=87=E5=87=86=E5=8C=96=E5=8D=8F=E4=BC=9A=E5=85=A5?= =?UTF-8?q?=E4=BC=9A=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzhHd-rh/step1.vue | 12 +++++++++--- .../pages/creatProcess/bzhHd-rh/step2.vue | 10 ++++++---- .../pages/creatProcess/bzhHd-rh/step3.vue | 10 +++++++--- .../pages/creatProcess/bzhHd-rh/step4.vue | 12 +++++++----- .../pages/creatProcess/bzhHd-rh/step5.vue | 10 +++++++--- .../pages/creatProcess/bzhHd-rh/step6.vue | 12 +++++++----- 6 files changed, 43 insertions(+), 23 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index 224b78ed4..49c7200d4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -580,7 +580,6 @@ export default { queryTaskFirst({ bpnId: this.$route.query.bpnId }).then(res => { - debugger let obj = JSON.parse(res.mes) let mes = {} if(obj.json !== undefined){ @@ -805,6 +804,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) @@ -816,11 +816,11 @@ export default { commentInfo: this.commentInfo })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, // 提交按钮 @@ -839,6 +839,7 @@ export default { this.$refs['roleForm'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true let paramsInfo = new FormData() // paramsInfo.append('id', this.bpnId || '') paramsInfo.append('createUser', this.$store.getters.userInfo.userId) @@ -864,8 +865,13 @@ export default { } this.$router.push("/processCenter"); } + }).finally(() => { + this.saveLoading = false this.isSubmit = false }) + }).catch(() => { + this.isSubmit = false + this.saveLoading = false }) } else { this.$message.warning('请完成流程信息的人员选择') diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index 8e7e65447..8425c2bf7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -208,7 +208,7 @@ show-submit show-back backBTNTexts="不涉及" - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" :submitLoading="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" @@ -380,7 +380,7 @@ export default { } this.$refs['rh_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) @@ -390,8 +390,9 @@ export default { this.$message.success('退回成功') this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) } @@ -417,6 +418,7 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false }); } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue index 082d2b38d..45a3da2c0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -467,6 +467,7 @@ export default { // 保存按钮 handleSave() { this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -477,11 +478,11 @@ export default { commentStep3: this.commentStep3 })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(e => { this.saveLoading = false + this.isSubmit = false }) }, // 提交按钮 @@ -496,6 +497,7 @@ export default { this.$refs['rh_pageData'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) @@ -505,8 +507,10 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } + }).finally(e => { + this.saveLoading = false this.isSubmit = false - }); + }) } }) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue index 4a358d522..5e28e9ced 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue @@ -228,7 +228,7 @@ show-back backBTNTexts="驳回" :submitLoading="isSubmit" - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" > @@ -373,7 +373,7 @@ export default { } this.$refs['rh_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) @@ -383,8 +383,9 @@ export default { this.$message.success('退回成功') this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) } @@ -412,8 +413,9 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + }) } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue index 73c8fbfc4..ab06a7f7c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue @@ -722,6 +722,7 @@ export default { // 保存按钮 handleSave() { this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -730,10 +731,10 @@ export default { commentStep5: this.commentStep5 })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { + this.isSubmit = false this.saveLoading = false }) }, @@ -748,6 +749,7 @@ export default { this.$refs['rh_pageData'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) @@ -757,8 +759,10 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + this.saveLoading = false + }) } }) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue index 40b039b2c..d328e9133 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue @@ -226,7 +226,7 @@ v-if="taskInfo !== '标准法规工程师汇总修订完毕'" show-submit show-back - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" :submitLoading="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" @@ -396,7 +396,7 @@ export default { } this.$refs['rh_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) @@ -406,8 +406,9 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) } @@ -446,8 +447,9 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + }) } }) } From a0dbd719aaf88c0a94675f1378b645d942fcf0f2 Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 6 Nov 2023 17:56:57 +0800 Subject: [PATCH 25/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E5=A4=96?= =?UTF-8?q?=E9=83=A8=E6=A0=87=E5=87=86=E5=8C=96=E5=8D=8F=E4=BC=9A=E5=8F=82?= =?UTF-8?q?=E4=BC=9A=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzhHy-ch/step1.vue | 10 ++++++++-- .../pages/creatProcess/bzhHy-ch/step2.vue | 12 +++++++----- .../pages/creatProcess/bzhHy-ch/step3.vue | 10 +++++++--- .../pages/creatProcess/bzhHy-ch/step4.vue | 12 +++++++----- .../pages/creatProcess/bzhHy-ch/step5.vue | 10 +++++++--- .../pages/creatProcess/bzhHy-ch/step6.vue | 12 +++++++----- 6 files changed, 43 insertions(+), 23 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index f28c9e77d..8028ecbfb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -713,6 +713,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) @@ -725,11 +726,11 @@ export default { })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, /** 提交按钮*/ @@ -748,6 +749,7 @@ export default { this.$refs['roleForm'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true let paramsInfo = new FormData() // paramsInfo.append('id', this.bpnId || '') paramsInfo.append('createUser', this.$store.getters.userInfo.userId) @@ -774,7 +776,11 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false + this.saveLoading = false }) + }).catch(e => { + this.saveLoading = false + this.isSubmit = false }) } else { this.$message.warning('请完成流程信息的人员选择') diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue index 7e677b171..51fa53458 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue @@ -205,7 +205,7 @@ show-back backBTNTexts="不涉及" :submitLoading="isSubmit" - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" > @@ -341,7 +341,7 @@ export default { } this.$refs['ch_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) @@ -351,8 +351,9 @@ export default { this.$message.success('退回成功') this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) } @@ -379,8 +380,9 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + }) } }) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue index 07b23a91c..82b8d9243 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue @@ -397,6 +397,7 @@ export default { // 保存按钮 handleSave() { this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -407,11 +408,11 @@ export default { ch_pageData: this.ch_pageData, })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, // 提交按钮 @@ -426,6 +427,7 @@ export default { this.$refs['ch_pageData'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) @@ -435,8 +437,10 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } + }).finally(() => { + this.saveLoading = false this.isSubmit = false - }); + }) } }) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue index 25847e144..865e6d01d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue @@ -209,7 +209,7 @@ show-submit show-back :submitLoading="isSubmit" - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" > @@ -323,7 +323,7 @@ export default { } this.$refs['ch_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) @@ -333,8 +333,9 @@ export default { this.$message.success('退回成功') this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) } @@ -361,8 +362,9 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + }) } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue index a833498e7..29d4b6158 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue @@ -502,6 +502,7 @@ export default { // 保存按钮 handleSave() { this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -510,11 +511,11 @@ export default { commentStep5: this.commentStep5 })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, // 提交按钮 @@ -527,6 +528,7 @@ export default { } this.$refs['ch_pageData'].validate((valid) => { if (valid) { + this.saveLoading = true this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) @@ -537,8 +539,10 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } + }).finally(() => { + this.saveLoading = false this.isSubmit = false - }); + }) } }) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue index bc24438ee..4aa6c9c39 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue @@ -212,7 +212,7 @@ v-if="taskInfo !== '标准法规工程师修订完毕'" show-submit show-back - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" :submitLoading="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" @@ -375,7 +375,7 @@ export default { } this.$refs['ch_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) @@ -385,8 +385,9 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) } @@ -425,8 +426,9 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + }) } }) From a3065afb5bed6b8b07ceaa72e1552f11378e2438 Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 6 Nov 2023 18:13:15 +0800 Subject: [PATCH 26/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E5=A4=96?= =?UTF-8?q?=E9=83=A8=E7=BD=B2=E5=90=8D=E6=8E=A8=E8=8D=90=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/wbsm/step1.vue | 12 ++++++++++-- .../processCenter/pages/creatProcess/wbsm/step2.vue | 11 +++++++---- .../processCenter/pages/creatProcess/wbsm/step3.vue | 11 +++++++---- .../processCenter/pages/creatProcess/wbsm/step4.vue | 11 +++++++---- .../processCenter/pages/creatProcess/wbsm/step5.vue | 11 +++++++---- 5 files changed, 38 insertions(+), 18 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue index 119fd333c..418950078 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue @@ -644,6 +644,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) @@ -655,11 +656,11 @@ export default { commentText: this.commentText })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(e => { this.saveLoading = false + this.isSubmit = false }) }, // 提交按钮 @@ -681,6 +682,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, @@ -714,7 +716,11 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false + this.saveLoading = false }); + } else { + this.saveLoading = false + this.isSubmit = false } }); } else { @@ -739,6 +745,7 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, @@ -751,6 +758,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false + this.saveLoading = false }); } else { return this.$message.warning("请完善人员信息"); diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue index 2dd40c2d6..923d5a620 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue @@ -144,8 +144,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -256,14 +256,13 @@ export default { methods: { //确认转办 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('调整成功') @@ -272,6 +271,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, processTable() { @@ -397,6 +398,7 @@ export default { roleForm: this.roleForm } var json = JSON.stringify(son) + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -408,6 +410,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue index 299aba65a..cdbf3798d 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue @@ -144,8 +144,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -256,14 +256,13 @@ export default { methods: { //确认转办 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('调整成功') @@ -272,6 +271,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, processTable() { @@ -397,6 +398,7 @@ export default { roleForm: this.roleForm } var json = JSON.stringify(son) + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -408,6 +410,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue index 9efc532a4..71371c831 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue @@ -144,8 +144,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -256,14 +256,13 @@ export default { methods: { //确认转办 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('调整成功') @@ -272,6 +271,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, processTable() { @@ -397,6 +398,7 @@ export default { roleForm: this.roleForm } var json = JSON.stringify(son) + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -408,6 +410,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue index 984c9a989..ef80a2819 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue @@ -144,8 +144,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -256,14 +256,13 @@ export default { methods: { //确认转办 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('调整成功') @@ -272,6 +271,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, processTable() { @@ -397,6 +398,7 @@ export default { roleForm: this.roleForm } var json = JSON.stringify(son) + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -408,6 +410,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); } From f81b67b5e039f2148ea2a4db9a94be1efd6ab789 Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 6 Nov 2023 18:27:29 +0800 Subject: [PATCH 27/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E5=8F=82?= =?UTF-8?q?=E4=B8=8E=E5=A4=96=E9=83=A8=E6=A0=87=E5=87=86=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=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 }) }, }, From 62152dc88d37eec904bce58ad1bab526ff3c4261 Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 6 Nov 2023 18:38:14 +0800 Subject: [PATCH 28/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E6=A0=87=E5=87=86=E5=8C=96=E5=8D=8F=E4=BC=9A=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=A4=87=E6=A1=88=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/jrbzhxh/step1.vue | 10 ++++++++-- .../pages/creatProcess/jrbzhxh/step2.vue | 15 +++++++-------- .../pages/creatProcess/jrbzhxh/step3.vue | 9 +++++---- .../pages/creatProcess/jrbzhxh/step4.vue | 9 +++++---- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue index 10dd1f3ba..3a0e50e42 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue @@ -186,6 +186,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, @@ -218,7 +219,11 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false + this.saveLoading = false }); + } else { + this.saveLoading = false + this.isSubmit = false } }); } else { @@ -229,6 +234,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); @@ -239,11 +245,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/jrbzhxh/step2.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue index e181634fb..b7add981b 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue @@ -323,9 +323,9 @@ show-save show-submit show-record - :recordLoading="recordLoading" + :recordLoading="isSubmit" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :saveLoading="isSubmit" @record="handleRecord" @save="handleSave" @submit="handleSubmit" @@ -561,7 +561,7 @@ export default { }, //不备案 handleRecord(){ - this.recordLoading = true + this.isSubmit = true this.dlFlag = '0' this.wbbzform.commentText = this.commentText; this.wbbzform.participantsData = this.participantsData @@ -578,14 +578,14 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } - this.recordLoading = false + this.isSubmit = false }, e => { }); }, //流程保存 handleSave() { - this.saveLoading = true + this.isSubmit = true this.wbbzform.fileName = this.fileInfoList this.wbbzform.commentText = this.commentText; this.wbbzform.participantsData = this.participantsData @@ -600,11 +600,10 @@ export default { form: this.wbbzform, })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.isSubmit = false }) }, //流程提交 diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue index adfb9110a..14bbac1e9 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue @@ -278,8 +278,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -384,14 +384,13 @@ export default { methods: { //确认转办 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('调整成功') @@ -400,6 +399,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, processTable() { diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue index 40c626c42..7906c2d84 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue @@ -278,8 +278,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -384,14 +384,13 @@ export default { methods: { //确认转办 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('调整成功') @@ -400,6 +399,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, processTable() { From e86444748674b9b0af28d748ec76eb9676a5d13e Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 6 Nov 2023 19:23:10 +0800 Subject: [PATCH 29/70] =?UTF-8?q?bug:=20=E4=BC=81=E6=A0=87=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbrk/step13.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 11994bf66..c8c54d1be 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -2792,7 +2792,7 @@ planForm.standCode = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS : this.form.standCode planForm.standId = res.data planForm.processType = "buss1"; - this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, { + this.$http.post("esRevisePlan/es-revise-plan/modPlanByStateAndScore", planForm, { _this: this }, res => { this.submitLoading = false From a2ae1a82780137817dcd1451fa709e986d38d7df Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 09:15:17 +0800 Subject: [PATCH 30/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF-=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/phone/bzzqyj/step2.vue | 12 ++++++++++-- .../processCenter/pages/phone/bzzqyj/step4-1.vue | 8 +++++++- .../processCenter/pages/phone/bzzqyj/step4-2.vue | 8 +++++++- src/pages/processCenter/pages/phone/bzzqyj/step6.vue | 6 +++++- src/pages/processCenter/pages/phone/bzzqyj/step7.vue | 6 +++++- src/pages/processCenter/pages/phone/bzzqyj/step8.vue | 6 +++++- src/pages/processCenter/pages/phone/bzzqyj/step9.vue | 6 +++++- 7 files changed, 44 insertions(+), 8 deletions(-) diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue index 0de7ecd04..349182a79 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue @@ -170,6 +170,8 @@ this.drawerModal = true }, checkedRole (data) { + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.account, // 委托人 @@ -186,6 +188,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -241,6 +246,7 @@ //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true let _formData = new FormData(); _formData.append("id", this.bpnId || ""); _formData.append("prcType", "3"); @@ -250,17 +256,18 @@ commentText2: this.commentText2 })); saveTaskForPub(_formData).then(res => { - this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { + }).finally(() => { this.saveLoading = false; + this.isSubmit = false }); }, handleSubmit() { this.$refs["bzzqyjForm"].validate((valid) => { if (valid) { this.isSubmit = true; + this.saveLoading = true; var json = this.json; json.onlyKey = this.onlyKey json.commentText = this.commentText2; @@ -281,6 +288,7 @@ // this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }); } else { return this.$message.warning("请完善基础信息"); diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue index 18c5368d2..2b4ff8d52 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue @@ -147,7 +147,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 @@ -350,6 +354,7 @@ var json = this.json json.spFlag = '1' json.commentText = this.commentText41 + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -361,6 +366,7 @@ this.$router.go(-2) // this.$router.push('/processCenter') } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue index 40e61ddc1..3abb3fd25 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue @@ -134,7 +134,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 @@ -333,6 +337,7 @@ var json = this.json json.bzFlag = '1' json.commentText = this.commentText42 + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -344,6 +349,7 @@ this.$router.go(-2) // this.$router.push('/processCenter') } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step6.vue b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue index b8054799e..9faf5105c 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue @@ -169,7 +169,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step7.vue b/src/pages/processCenter/pages/phone/bzzqyj/step7.vue index a75ac4ef8..8f9d6c5f6 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step7.vue @@ -159,7 +159,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step8.vue b/src/pages/processCenter/pages/phone/bzzqyj/step8.vue index e2af85e1d..dce586d69 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step8.vue @@ -159,7 +159,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step9.vue b/src/pages/processCenter/pages/phone/bzzqyj/step9.vue index 9085f23bd..bebe87436 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step9.vue @@ -159,7 +159,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 From 271fe6069b15c8a9e63b3d6e2f60725cd140b656 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 09:23:42 +0800 Subject: [PATCH 31/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF-=E6=A0=87=E5=87=86=E8=B0=83=E7=A0=94?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/phone/bzdy/step2.vue | 12 ++++++++++-- src/pages/processCenter/pages/phone/bzdy/step4.vue | 6 +++++- src/pages/processCenter/pages/phone/bzdy/step6.vue | 6 +++++- src/pages/processCenter/pages/phone/bzdy/step7.vue | 6 +++++- src/pages/processCenter/pages/phone/bzdy/step8.vue | 6 +++++- src/pages/processCenter/pages/phone/bzdy/step9.vue | 6 +++++- 6 files changed, 35 insertions(+), 7 deletions(-) diff --git a/src/pages/processCenter/pages/phone/bzdy/step2.vue b/src/pages/processCenter/pages/phone/bzdy/step2.vue index 1a7a6b43a..0ec495e42 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step2.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step2.vue @@ -166,6 +166,8 @@ this.drawerModal = true }, checkedRole (data) { + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.account, // 委托人 @@ -182,6 +184,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -238,6 +243,7 @@ }, handleSave() { this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -245,16 +251,17 @@ commentText2: this.commentText2, })) 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 var json = this.json json.commentText = this.commentText2 json.responUserList = this.form.responUserList @@ -271,6 +278,7 @@ // this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } else { return this.$message.warning('请完善基础信息') diff --git a/src/pages/processCenter/pages/phone/bzdy/step4.vue b/src/pages/processCenter/pages/phone/bzdy/step4.vue index 21aafa67a..e0015b33d 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step4.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step4.vue @@ -94,7 +94,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/bzdy/step6.vue b/src/pages/processCenter/pages/phone/bzdy/step6.vue index c08548834..6645dc5e2 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step6.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step6.vue @@ -103,7 +103,8 @@ approval @back="handleSubmitNo" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" show-transfer @transfer="handleTransfer" @submit="handleSubmit" @@ -200,6 +201,7 @@ this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.account, // 委托人 @@ -216,6 +218,8 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/bzdy/step7.vue b/src/pages/processCenter/pages/phone/bzdy/step7.vue index 7f2548749..9ff559a7c 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step7.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step7.vue @@ -94,7 +94,8 @@ approval @back="handleSubmitNo" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" show-transfer @transfer="handleTransfer" @submit="handleSubmit" @@ -158,6 +159,7 @@ this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.account, // 委托人 @@ -174,6 +176,8 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/bzdy/step8.vue b/src/pages/processCenter/pages/phone/bzdy/step8.vue index 85b60740f..4b77cb7c6 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step8.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step8.vue @@ -94,7 +94,8 @@ approval @back="handleSubmitNo" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" show-transfer @transfer="handleTransfer" @submit="handleSubmit" @@ -158,6 +159,7 @@ this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.account, // 委托人 @@ -174,6 +176,8 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/bzdy/step9.vue b/src/pages/processCenter/pages/phone/bzdy/step9.vue index fe604e66f..c81afb3b8 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step9.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step9.vue @@ -119,7 +119,8 @@ approval @back="handleSubmitNo" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" show-transfer @transfer="handleTransfer" @submit="handleSubmit" @@ -185,6 +186,7 @@ this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.account, // 委托人 @@ -201,6 +203,8 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 From f8c61e854eb89ec6076901a9570d5a9a3d0d7950 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 09:28:34 +0800 Subject: [PATCH 32/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF-=E5=A4=96=E9=83=A8=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8C=96=E5=8D=8F=E4=BC=9A=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/phone/bzhHd-rh/step2.vue | 12 +++++++----- .../processCenter/pages/phone/bzhHd-rh/step4.vue | 12 +++++++----- .../processCenter/pages/phone/bzhHd-rh/step6.vue | 12 +++++++----- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue index a63b906b9..2c0d928df 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue @@ -107,7 +107,7 @@ show-submit show-back backBTNTexts="不涉及" - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" :submitLoading="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" @@ -231,7 +231,7 @@ export default { } this.$refs['rh_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.account) @@ -243,8 +243,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) } @@ -272,8 +273,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + }) } }) }, diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue index fc6b3373c..9a5dc14e1 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue @@ -121,7 +121,7 @@ show-back backBTNTexts="驳回" :submitLoading="isSubmit" - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" > @@ -244,7 +244,7 @@ export default { } this.$refs['rh_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.account) @@ -256,8 +256,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) } @@ -287,8 +288,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + }) } }) }, diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue index 1a12b4245..2a90d914c 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue @@ -128,7 +128,7 @@ v-if="taskInfo !== '标准法规工程师汇总修订完毕'" show-submit show-back - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" :submitLoading="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" @@ -262,7 +262,7 @@ export default { } this.$refs['rh_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.account) @@ -274,8 +274,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) } @@ -311,8 +312,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + }) } }) } From 7670fd9cbf5091817be031690b7cfe37df41c838 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 09:33:10 +0800 Subject: [PATCH 33/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF-=E5=A4=96=E9=83=A8=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8C=96=E5=8D=8F=E4=BC=9A=E5=8F=82=E4=BC=9A=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/phone/bzhHd-ch/step2.vue | 12 +++++++----- .../processCenter/pages/phone/bzhHd-ch/step4.vue | 12 +++++++----- .../processCenter/pages/phone/bzhHd-ch/step6.vue | 12 +++++++----- .../processCenter/pages/phone/bzhHd-hh/step2.vue | 12 +++++++----- 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue index 053561ac1..33d486c99 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue @@ -104,7 +104,7 @@ show-back backBTNTexts="不涉及" :submitLoading="isSubmit" - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" > @@ -207,7 +207,7 @@ export default { } this.$refs['ch_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.account) @@ -219,8 +219,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) } @@ -249,8 +250,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + }) } }) diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue index 5c497784c..9260c9ccb 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue @@ -108,7 +108,7 @@ show-submit show-back :submitLoading="isSubmit" - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" > @@ -203,7 +203,7 @@ export default { } this.$refs['ch_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.account) @@ -215,8 +215,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) } @@ -245,8 +246,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + }) } }) }, diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue index 981300b92..69641d365 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue @@ -110,7 +110,7 @@ v-if="taskInfo !== '标准法规工程师修订完毕'" show-submit show-back - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" :submitLoading="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" @@ -253,7 +253,7 @@ export default { } this.$refs['ch_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.account) @@ -265,8 +265,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) } @@ -307,8 +308,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + }) } }) diff --git a/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue index 1dd910e18..2322ef2dd 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue @@ -126,7 +126,7 @@ show-back show-submit :submitLoading="isSubmit" - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" /> @@ -276,7 +276,7 @@ export default { } this.$refs['hh_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.account) @@ -288,8 +288,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) }, @@ -314,8 +315,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + }) } }) } From 062594fc09ecc012346a5cf44913554e38fc2ccc Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 09:37:42 +0800 Subject: [PATCH 34/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF-=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/phone/bzjd/step4.vue | 6 +++++- src/pages/processCenter/pages/phone/bzjd/step5.vue | 6 +++++- src/pages/processCenter/pages/phone/bzjd/step6.vue | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/phone/bzjd/step4.vue b/src/pages/processCenter/pages/phone/bzjd/step4.vue index a8009b090..b9d425084 100644 --- a/src/pages/processCenter/pages/phone/bzjd/step4.vue +++ b/src/pages/processCenter/pages/phone/bzjd/step4.vue @@ -228,7 +228,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/bzjd/step5.vue b/src/pages/processCenter/pages/phone/bzjd/step5.vue index d3ed35a30..fc5853aed 100644 --- a/src/pages/processCenter/pages/phone/bzjd/step5.vue +++ b/src/pages/processCenter/pages/phone/bzjd/step5.vue @@ -238,7 +238,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/bzjd/step6.vue b/src/pages/processCenter/pages/phone/bzjd/step6.vue index c60efa2d1..2454f48be 100644 --- a/src/pages/processCenter/pages/phone/bzjd/step6.vue +++ b/src/pages/processCenter/pages/phone/bzjd/step6.vue @@ -226,7 +226,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 From 214911dd7cef60b4b9a4c62e057f8a59b1ed7d77 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 09:39:30 +0800 Subject: [PATCH 35/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF-=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=8F=91=E5=B8=83/=E6=9B=B4=E6=96=B0=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/phone/bzqdfb/step4.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/phone/bzqdfb/step4.vue b/src/pages/processCenter/pages/phone/bzqdfb/step4.vue index 5fcf12276..0ca57fa35 100644 --- a/src/pages/processCenter/pages/phone/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/phone/bzqdfb/step4.vue @@ -133,9 +133,9 @@ show-back show-submit show-transfer - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @transfer="handleTransfer" @back="beforeBack" @@ -265,6 +265,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -280,6 +281,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, From ea2e1345e7f58ff0cf4098cc033b6bdf69490c33 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 10:05:50 +0800 Subject: [PATCH 36/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF-=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/phone/bzpg/step2.vue | 7 +++++-- src/pages/processCenter/pages/phone/bzpg/step6.vue | 7 +++++-- src/pages/processCenter/pages/phone/bzpg/step7.vue | 7 +++++-- src/pages/processCenter/pages/phone/bzpg/step8.vue | 7 +++++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/pages/processCenter/pages/phone/bzpg/step2.vue b/src/pages/processCenter/pages/phone/bzpg/step2.vue index c13037dcf..a108ca491 100644 --- a/src/pages/processCenter/pages/phone/bzpg/step2.vue +++ b/src/pages/processCenter/pages/phone/bzpg/step2.vue @@ -91,9 +91,9 @@ show-transfer show-back show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @transfer="handleTransfer" @back="beforeBack" @@ -265,6 +265,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -280,6 +281,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/bzpg/step6.vue b/src/pages/processCenter/pages/phone/bzpg/step6.vue index a6abe59be..9df3c3075 100644 --- a/src/pages/processCenter/pages/phone/bzpg/step6.vue +++ b/src/pages/processCenter/pages/phone/bzpg/step6.vue @@ -190,9 +190,9 @@ show-transfer show-back show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @transfer="handleTransfer" @back="beforeBack" @@ -371,6 +371,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -386,6 +387,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/bzpg/step7.vue b/src/pages/processCenter/pages/phone/bzpg/step7.vue index 4d75ef018..442da506c 100644 --- a/src/pages/processCenter/pages/phone/bzpg/step7.vue +++ b/src/pages/processCenter/pages/phone/bzpg/step7.vue @@ -201,9 +201,9 @@ { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/bzpg/step8.vue b/src/pages/processCenter/pages/phone/bzpg/step8.vue index 22c9333b8..b9ec63ac6 100644 --- a/src/pages/processCenter/pages/phone/bzpg/step8.vue +++ b/src/pages/processCenter/pages/phone/bzpg/step8.vue @@ -201,9 +201,9 @@ { + this.isSubmit = false }) this.modalshowflag = false }, From 8b0c98b9c3f5a8bb225f438d32ccd6ca8aaf4079 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 10:09:26 +0800 Subject: [PATCH 37/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF-=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/phone/xmpg/step4.vue | 9 +++++++-- src/pages/processCenter/pages/phone/xmpg/step5.vue | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/phone/xmpg/step4.vue b/src/pages/processCenter/pages/phone/xmpg/step4.vue index 32532ee04..b490c801c 100644 --- a/src/pages/processCenter/pages/phone/xmpg/step4.vue +++ b/src/pages/processCenter/pages/phone/xmpg/step4.vue @@ -180,9 +180,9 @@ show-back show-submit show-transfer - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @transfer="handleTransfer" @back="beforeBack" @@ -316,6 +316,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -331,6 +332,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, @@ -471,6 +474,7 @@ export default { this.listForm.passFlag = "1"; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -484,6 +488,7 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + this.isSubmit = false; }, e => { }); } diff --git a/src/pages/processCenter/pages/phone/xmpg/step5.vue b/src/pages/processCenter/pages/phone/xmpg/step5.vue index efb87a427..1964ac11f 100644 --- a/src/pages/processCenter/pages/phone/xmpg/step5.vue +++ b/src/pages/processCenter/pages/phone/xmpg/step5.vue @@ -179,9 +179,9 @@ { + this.isSubmit = false }) this.modalshowflag = false }, @@ -469,6 +472,7 @@ export default { this.listForm.dlFlag = "2"; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -482,6 +486,7 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + this.isSubmit = false; }, e => { }); } From 98c97dbaac8c28d350e00ef0d163231dd696ecbc Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 10:11:28 +0800 Subject: [PATCH 38/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF-=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/phone/xmqdqr/step5.vue | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/pages/processCenter/pages/phone/xmqdqr/step5.vue b/src/pages/processCenter/pages/phone/xmqdqr/step5.vue index 5c5785514..ff8336f4e 100644 --- a/src/pages/processCenter/pages/phone/xmqdqr/step5.vue +++ b/src/pages/processCenter/pages/phone/xmqdqr/step5.vue @@ -196,9 +196,9 @@ show-transfer show-back show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @transfer="handleTransfer" @back="beforeBack" @@ -369,6 +369,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -384,6 +385,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, @@ -516,7 +519,7 @@ export default { }, //保存事件 handleSave() { - this.saveLoading = true; + this.isSubmit = true; let _formData = new FormData(); this.qdform.dataList = this.dataList _formData.append("id", this.bpnId || ""); @@ -527,12 +530,11 @@ export default { commentText: this.commentText })); saveTaskForPub(_formData).then(res => { - this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { - this.saveLoading = false; - }); + }).finally(() => { + this.isSubmit = false + }) }, handleRemark(){ this.dataList.map(item => { @@ -549,6 +551,7 @@ export default { this.qdform.passFlag = "1"; this.qdform.commentText = this.commentText; const json = JSON.stringify(this.qdform); + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -562,6 +565,7 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + this.isSubmit = false; }, e => { }); } From 81c40db82dd1d90eab6ad937467b31c4b112e6f2 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 10:14:18 +0800 Subject: [PATCH 39/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF-=E5=8A=A0=E5=85=A5=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8C=96=E5=8D=8F=E4=BC=9A=E4=BF=A1=E6=81=AF=E6=8F=90=E6=8A=A5?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/phone/jrbzhxh/step3.vue | 9 ++++++--- src/pages/processCenter/pages/phone/jrbzhxh/step4.vue | 7 +++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue b/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue index caa38853a..3d3c17f27 100644 --- a/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue +++ b/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue @@ -213,8 +213,8 @@ show-back show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -478,6 +478,7 @@ export default { this.roleTransfer = data; this.phoneRoleList = this.roleTransfer; this.turnLoading = true; + this.isSubmit = true; changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -493,7 +494,9 @@ export default { } else { this.$message.warning(res.message); } - }); + }).finally(() => { + this.isSubmit = false + }) this.modalshowflag = false; }, //流程提交 diff --git a/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue b/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue index cedaeed14..0f68accbf 100644 --- a/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue +++ b/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue @@ -213,8 +213,8 @@ show-back show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -464,6 +464,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -479,6 +480,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, From 40447d9848ff143e1c49785b4288f4a9769b97fe Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 10:19:30 +0800 Subject: [PATCH 40/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF-=E5=A4=96=E9=83=A8=E7=BD=B2=E5=90=8D?= =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/phone/wbsm/step3.vue | 16 ++++++++++------ .../processCenter/pages/phone/wbsm/step4.vue | 16 ++++++++++------ .../processCenter/pages/phone/wbsm/step5.vue | 16 ++++++++++------ 3 files changed, 30 insertions(+), 18 deletions(-) diff --git a/src/pages/processCenter/pages/phone/wbsm/step3.vue b/src/pages/processCenter/pages/phone/wbsm/step3.vue index d4b35a331..35138ef03 100644 --- a/src/pages/processCenter/pages/phone/wbsm/step3.vue +++ b/src/pages/processCenter/pages/phone/wbsm/step3.vue @@ -74,9 +74,9 @@ show-transfer show-back show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @transfer="handleTransfer" @back="beforeBack" @@ -275,7 +275,7 @@ export default { }, // 保存按钮 handleSave() { - this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -284,11 +284,10 @@ export default { commentText: this.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.isSubmit = false }) }, // 提交按钮 @@ -330,6 +329,7 @@ export default { roleForm: this.roleForm } var json = JSON.stringify(son) + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -343,6 +343,7 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); } @@ -358,6 +359,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -373,6 +375,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/wbsm/step4.vue b/src/pages/processCenter/pages/phone/wbsm/step4.vue index 090206f95..458c4b837 100644 --- a/src/pages/processCenter/pages/phone/wbsm/step4.vue +++ b/src/pages/processCenter/pages/phone/wbsm/step4.vue @@ -80,9 +80,9 @@ show-transfer show-back show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @transfer="handleTransfer" @back="beforeBack" @@ -281,7 +281,7 @@ export default { }, // 保存按钮 handleSave() { - this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -290,11 +290,10 @@ export default { commentText: this.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.isSubmit = false }) }, // 提交按钮 @@ -336,6 +335,7 @@ export default { roleForm: this.roleForm } var json = JSON.stringify(son) + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -349,6 +349,7 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); } @@ -364,6 +365,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -379,6 +381,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/wbsm/step5.vue b/src/pages/processCenter/pages/phone/wbsm/step5.vue index 326a4ce0a..9b610cba9 100644 --- a/src/pages/processCenter/pages/phone/wbsm/step5.vue +++ b/src/pages/processCenter/pages/phone/wbsm/step5.vue @@ -80,9 +80,9 @@ show-transfer show-back show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @transfer="handleTransfer" @back="beforeBack" @@ -281,7 +281,7 @@ export default { }, // 保存按钮 handleSave() { - this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -290,11 +290,10 @@ export default { commentText: this.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.isSubmit = false }) }, // 提交按钮 @@ -336,6 +335,7 @@ export default { roleForm: this.roleForm } var json = JSON.stringify(son) + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -349,6 +349,7 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); } @@ -364,6 +365,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -379,6 +381,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, From 8fd6abfae93d8de293747829a5bc2fb2403fe77e Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 10:21:58 +0800 Subject: [PATCH 41/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF-=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/phone/wfhxzg/step2.vue | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step2.vue b/src/pages/processCenter/pages/phone/wfhxzg/step2.vue index 7b4d2c330..322fa32c4 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step2.vue @@ -92,8 +92,8 @@ show-back show-transfer :submitLoading="isSubmit" - :saveLoading="saveLoading" - :transferLoading="turnLoading" + :saveLoading="isSubmit" + :isSubmitBack="isSubmit" @transfer="handleTurnTo" @save="handleSave" @submit="handleSubmit" @@ -250,7 +250,7 @@ export default { }, // 保存按钮 handleSave() { - this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -259,11 +259,10 @@ export default { commentInfo: this.commentInfo })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.isSubmit = false }) }, //驳回按钮 @@ -294,6 +293,7 @@ export default { passFlag: '1', commentText: this.commentInfo } + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.account) @@ -305,8 +305,7 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } - this.isSubmit = false - }).catch(e => { + }).finally(() => { this.isSubmit = false }) } @@ -358,7 +357,7 @@ export default { // this.$router.push("/processCenter"); } this.isSubmit = false - }).catch(e => { + }).finally(() => { this.isSubmit = false }) }, @@ -366,6 +365,7 @@ export default { drawerCheck (data) { if (this.drawerTitle === '转办处理人') { this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -381,6 +381,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) } else { if (data.length > 0) { From 04c85f6cc45ad9d70bf45b8e4cd0a1fa3ca37913 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 10:30:48 +0800 Subject: [PATCH 42/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF-=E5=8F=82=E4=B8=8E=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=88=B6=E4=BF=AE=E8=AE=A2=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=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 --- .../processCenter/pages/phone/cywbbzzxd/step2.vue | 2 +- .../processCenter/pages/phone/cywbbzzxd/step4.vue | 10 +++++++--- .../processCenter/pages/phone/cywbbzzxd/step5.vue | 10 +++++++--- .../processCenter/pages/phone/cywbbzzxd/step6.vue | 10 +++++++--- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/pages/processCenter/pages/phone/cywbbzzxd/step2.vue b/src/pages/processCenter/pages/phone/cywbbzzxd/step2.vue index 84ea640c3..aff4ca1f4 100644 --- a/src/pages/processCenter/pages/phone/cywbbzzxd/step2.vue +++ b/src/pages/processCenter/pages/phone/cywbbzzxd/step2.vue @@ -75,7 +75,7 @@ show-save show-submit :submitLoading="isSubmit" - :saveLoading="saveLoading" + :saveLoading="isSubmit" @save="handleSave" @submit="handleSubmit" > diff --git a/src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue b/src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue index ee91cc91d..e4e480aa7 100644 --- a/src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue +++ b/src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue @@ -172,8 +172,8 @@ show-back show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -324,6 +324,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.account, @@ -346,7 +347,6 @@ export default { } }, handleSubmit() { - this.isSubmit = true; if (this.participantsData.length < 1) { this.$message.warning("项目信息不能为空"); } else { @@ -363,6 +363,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.account, @@ -395,6 +396,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -410,6 +412,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue b/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue index d002c4a37..2490fcaa6 100644 --- a/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue +++ b/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue @@ -172,8 +172,8 @@ show-back show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -324,6 +324,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.account, @@ -346,7 +347,6 @@ export default { } }, handleSubmit() { - this.isSubmit = true; if (this.participantsData.length < 1) { this.$message.warning("项目信息不能为空"); } else { @@ -363,6 +363,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.account, @@ -395,6 +396,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -410,6 +412,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue b/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue index 45c13d9d5..c6415f46a 100644 --- a/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue +++ b/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue @@ -172,8 +172,8 @@ show-back show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -324,6 +324,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.account, @@ -346,7 +347,6 @@ export default { } }, handleSubmit() { - this.isSubmit = true; if (this.participantsData.length < 1) { this.$message.warning("项目信息不能为空"); } else { @@ -363,6 +363,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.account, @@ -395,6 +396,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -410,6 +412,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, From a28e906f4ad05e8a73414ce80dae9896b45f3e9b Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 10:48:02 +0800 Subject: [PATCH 43/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF-=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue | 7 +++++-- src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue | 7 +++++-- src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue | 7 +++++-- src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue | 7 +++++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue index f8bcad178..dda47e964 100644 --- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue +++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue @@ -85,8 +85,8 @@ show-submit show-transfer :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -246,6 +246,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -261,6 +262,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue index e1082b62f..3f0253cc3 100644 --- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue +++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue @@ -85,8 +85,8 @@ show-submit show-transfer :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -246,6 +246,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -261,6 +262,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue index 3c34180a3..531bbe459 100644 --- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue +++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue @@ -85,8 +85,8 @@ show-back show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -245,6 +245,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -260,6 +261,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue index f313f6a39..5889aa049 100644 --- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue @@ -85,8 +85,8 @@ show-back show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -245,6 +245,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -260,6 +261,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, From 7d438de94a12144925af55e4cdd4f4df9cdc534f Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 10:52:45 +0800 Subject: [PATCH 44/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF-=E4=BC=81=E6=A0=87=E5=A4=8D=E5=AE=A1?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/phone/qbfs/step5.vue | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/pages/processCenter/pages/phone/qbfs/step5.vue b/src/pages/processCenter/pages/phone/qbfs/step5.vue index 39537283d..86a0ced25 100644 --- a/src/pages/processCenter/pages/phone/qbfs/step5.vue +++ b/src/pages/processCenter/pages/phone/qbfs/step5.vue @@ -562,6 +562,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.account) @@ -572,11 +573,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 }) }, processEditFile(id) { @@ -615,13 +616,16 @@ export default { return res }) } - this.submitLoading = false // hwh5.close() this.$router.go(-2) // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } else { + this.submitLoading = false this.isSubmit = false } + }).catch(() => { + this.submitLoading = false + this.isSubmit = false }) }, async routerBussProStand(){ @@ -651,10 +655,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 }) }, //流程提交 @@ -674,8 +679,10 @@ export default { _this: this }, res => { if (res.success) { - this.isSubmit = false this.processCreateFsBuss(json) + } else { + this.isSubmit = false + this.saveLoading = false } }, e => { }); From 4f95cd31952284f6c7cfd350630b1a375ba75b7d Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 10:56:52 +0800 Subject: [PATCH 45/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF-=E4=BC=81=E6=A0=87=E5=BA=9F=E6=AD=A2?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/phone/qbfz/step2.vue | 7 +++++-- src/pages/processCenter/pages/phone/qbfz/step5.vue | 7 +++++-- src/pages/processCenter/pages/phone/qbfz/step6.vue | 7 +++++-- src/pages/processCenter/pages/phone/qbfz/step7.vue | 7 +++++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/pages/processCenter/pages/phone/qbfz/step2.vue b/src/pages/processCenter/pages/phone/qbfz/step2.vue index 1877c55c2..f4b4d02e9 100644 --- a/src/pages/processCenter/pages/phone/qbfz/step2.vue +++ b/src/pages/processCenter/pages/phone/qbfz/step2.vue @@ -53,9 +53,9 @@ show-back show-transfer show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -241,6 +241,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -256,6 +257,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/qbfz/step5.vue b/src/pages/processCenter/pages/phone/qbfz/step5.vue index d06996a92..d4ab4ba2d 100644 --- a/src/pages/processCenter/pages/phone/qbfz/step5.vue +++ b/src/pages/processCenter/pages/phone/qbfz/step5.vue @@ -91,9 +91,9 @@ show-transfer show-submit show-back - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -300,6 +300,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -315,6 +316,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/qbfz/step6.vue b/src/pages/processCenter/pages/phone/qbfz/step6.vue index ddc59c752..730179d61 100644 --- a/src/pages/processCenter/pages/phone/qbfz/step6.vue +++ b/src/pages/processCenter/pages/phone/qbfz/step6.vue @@ -91,9 +91,9 @@ show-transfer show-submit show-back - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -294,6 +294,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -309,6 +310,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/qbfz/step7.vue b/src/pages/processCenter/pages/phone/qbfz/step7.vue index 4bf9be0b3..50df76c28 100644 --- a/src/pages/processCenter/pages/phone/qbfz/step7.vue +++ b/src/pages/processCenter/pages/phone/qbfz/step7.vue @@ -91,9 +91,9 @@ show-transfer show-submit show-back - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -300,6 +300,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -315,6 +316,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, From d6ee244ed4982f3d7eede131035a363e2b6b4620 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 11:00:55 +0800 Subject: [PATCH 46/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF-=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/phone/wfhxzg/step3.vue | 17 +++++++++-------- .../processCenter/pages/phone/wfhxzg/step5.vue | 8 ++++++-- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step3.vue b/src/pages/processCenter/pages/phone/wfhxzg/step3.vue index 39a53ca52..6d10c2b81 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step3.vue @@ -95,8 +95,8 @@ show-submit show-transfer :submitLoading="isSubmit" - :saveLoading="saveLoading" - :transferLoading="turnLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" @transfer="handleTurnTo" @save="handleSave" @submit="handleSubmit" @@ -272,7 +272,7 @@ export default { for(let item of zqa) { list.push(item[1]) } - this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -281,11 +281,10 @@ export default { textarea: this.textarea })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.isSubmit = false }) }, // 提交按钮 @@ -334,8 +333,7 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } - this.isSubmit = false - }).catch(e => { + }).finally(() => { this.isSubmit = false }) }, @@ -343,6 +341,7 @@ export default { phoneSumit (data) { if (this.roleTitle === '转办处理人') { this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -360,6 +359,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) } else { if (data.length > 0) { diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue index 3b4e12028..d63d615b0 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue @@ -73,8 +73,7 @@ show-transfer @back="handleSubmitNo" :submitLoading="isSubmit" - :isSubmitBack="backLoading" - :transferLoading="turnLoading" + :isSubmitBack="isSubmit" @transfer="handleTurnTo" @submit="handleSubmit" submitBTNText="同意" @@ -242,6 +241,7 @@ export default { }, // 转办选人框 phoneSumit (data) { + this.isSubmit = true changeAssigneeNew({ taskId: this.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -257,6 +257,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) // this.showPage = false }, @@ -268,6 +270,7 @@ export default { actionFlag: 1, commentText: this.commentText } + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -280,6 +283,7 @@ export default { // this.$router.push('/processCenter') this.backLoading = false } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') From 74fa2c571856bd1dace44b3518f9aa2ad1679a45 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 11:06:36 +0800 Subject: [PATCH 47/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF-=E6=94=BF=E7=AD=96=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/phone/zczqyj/step4.vue | 8 +++++++- src/pages/processCenter/pages/phone/zczqyj/step5.vue | 6 +++++- src/pages/processCenter/pages/phone/zczqyj/step6.vue | 6 +++++- src/pages/processCenter/pages/phone/zczqyj/step7.vue | 6 +++++- src/pages/processCenter/pages/phone/zczqyj/step8.vue | 6 +++++- src/pages/processCenter/pages/phone/zczqyj/step9.vue | 6 +++++- 6 files changed, 32 insertions(+), 6 deletions(-) diff --git a/src/pages/processCenter/pages/phone/zczqyj/step4.vue b/src/pages/processCenter/pages/phone/zczqyj/step4.vue index 47f59da57..eea7ac717 100644 --- a/src/pages/processCenter/pages/phone/zczqyj/step4.vue +++ b/src/pages/processCenter/pages/phone/zczqyj/step4.vue @@ -133,7 +133,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 @@ -285,6 +289,7 @@ export default { //这个就是原来的actionFlag，用来表示流程是驳回还是同意 json.actionFlag = 1 json.commentText = this.commentText + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -296,6 +301,7 @@ export default { this.$router.go(-2) // this.$router.push('/processCenter') } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') diff --git a/src/pages/processCenter/pages/phone/zczqyj/step5.vue b/src/pages/processCenter/pages/phone/zczqyj/step5.vue index 3def4a3f4..ec07bc303 100644 --- a/src/pages/processCenter/pages/phone/zczqyj/step5.vue +++ b/src/pages/processCenter/pages/phone/zczqyj/step5.vue @@ -207,7 +207,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/zczqyj/step6.vue b/src/pages/processCenter/pages/phone/zczqyj/step6.vue index 309620d97..7fb8e9da8 100644 --- a/src/pages/processCenter/pages/phone/zczqyj/step6.vue +++ b/src/pages/processCenter/pages/phone/zczqyj/step6.vue @@ -141,7 +141,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/zczqyj/step7.vue b/src/pages/processCenter/pages/phone/zczqyj/step7.vue index 9b81e5b34..4090c36de 100644 --- a/src/pages/processCenter/pages/phone/zczqyj/step7.vue +++ b/src/pages/processCenter/pages/phone/zczqyj/step7.vue @@ -141,7 +141,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/zczqyj/step8.vue b/src/pages/processCenter/pages/phone/zczqyj/step8.vue index 87163a7ad..fa39b6103 100644 --- a/src/pages/processCenter/pages/phone/zczqyj/step8.vue +++ b/src/pages/processCenter/pages/phone/zczqyj/step8.vue @@ -141,7 +141,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/zczqyj/step9.vue b/src/pages/processCenter/pages/phone/zczqyj/step9.vue index 3f613cbbd..acb0ea311 100644 --- a/src/pages/processCenter/pages/phone/zczqyj/step9.vue +++ b/src/pages/processCenter/pages/phone/zczqyj/step9.vue @@ -141,7 +141,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 From 3322393853da260e7a517bd933187e5909e160c5 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 11:08:16 +0800 Subject: [PATCH 48/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF-=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/phone/bzrk/step2.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue index 5d3975319..369397290 100644 --- a/src/pages/processCenter/pages/phone/bzrk/step2.vue +++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue @@ -424,7 +424,7 @@ show-submit2 show-transfer :submitLoading="isSubmit" - :saveLoading="saveLoading" + :saveLoading="isSubmit" @transfer="handleTransfer" @submit2="handle2" @over2="handle1" @@ -661,6 +661,7 @@ export default { }, checkedRole(data) { this.assigneeNewLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId: this.$store.getters.userInfo.account, // 委托人 @@ -679,6 +680,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, downloadFileNew(attId) { From be595c76456a9e31da93b964f0a3602bc7421258 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 11:17:50 +0800 Subject: [PATCH 49/70] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF-=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E6=B5=81=E7=A8=8B=E5=8F=8A=E4=BC=81=E4=B8=9A=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=BA=93=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/phone/qbrk-product/step10.vue | 4 +++- src/pages/processCenter/pages/phone/qbrk-product/step12.vue | 4 +++- src/pages/processCenter/pages/phone/qbrk-product/step4.vue | 4 +++- src/pages/processCenter/pages/phone/qbrk-product/step7.vue | 4 ++-- src/pages/processCenter/pages/phone/qbrk-product/step8.vue | 4 +++- src/pages/processCenter/pages/phone/qbrk/step10.vue | 4 +++- src/pages/processCenter/pages/phone/qbrk/step11.vue | 4 +++- src/pages/processCenter/pages/phone/qbrk/step4.vue | 4 +++- src/pages/processCenter/pages/phone/qbrk/step8.vue | 4 ++-- 9 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step10.vue b/src/pages/processCenter/pages/phone/qbrk-product/step10.vue index 895f2f6a6..d18a4faa4 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/step10.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/step10.vue @@ -1916,6 +1916,7 @@ export default { 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); @@ -1934,7 +1935,6 @@ export default { this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // hwh5.close() this.$router.go(-2) // 流程提交之后，应该流转至待办任务页面 @@ -1942,6 +1942,8 @@ export default { }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step12.vue b/src/pages/processCenter/pages/phone/qbrk-product/step12.vue index c5589eef6..33c2550ce 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/step12.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/step12.vue @@ -1916,6 +1916,7 @@ export default { 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); @@ -1934,7 +1935,6 @@ export default { this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // hwh5.close() this.$router.go(-2) // 流程提交之后，应该流转至待办任务页面 @@ -1942,6 +1942,8 @@ export default { }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step4.vue b/src/pages/processCenter/pages/phone/qbrk-product/step4.vue index 4b6506d62..8f3f9490e 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/step4.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/step4.vue @@ -1914,6 +1914,7 @@ export default { 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); @@ -1932,7 +1933,6 @@ export default { this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // hwh5.close() this.$router.go(-2) // 流程提交之后，应该流转至待办任务页面 @@ -1940,6 +1940,8 @@ export default { }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step7.vue b/src/pages/processCenter/pages/phone/qbrk-product/step7.vue index bb043f408..e4bee7381 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/step7.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/step7.vue @@ -2024,8 +2024,6 @@ export default { if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false // hwh5.close() this.$router.go(-2) // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) @@ -2040,6 +2038,8 @@ export default { }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) } diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step8.vue b/src/pages/processCenter/pages/phone/qbrk-product/step8.vue index c0722663f..d6cfee5d4 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/step8.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/step8.vue @@ -1916,6 +1916,7 @@ export default { 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); @@ -1934,7 +1935,6 @@ export default { this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // hwh5.close() this.$router.go(-2) // 流程提交之后，应该流转至待办任务页面 @@ -1942,6 +1942,8 @@ export default { }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/phone/qbrk/step10.vue b/src/pages/processCenter/pages/phone/qbrk/step10.vue index 7fa1f61ab..afc38827d 100644 --- a/src/pages/processCenter/pages/phone/qbrk/step10.vue +++ b/src/pages/processCenter/pages/phone/qbrk/step10.vue @@ -1915,6 +1915,7 @@ export default { 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); @@ -1932,7 +1933,6 @@ export default { this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // hwh5.close() this.$router.go(-2) // 流程提交之后，应该流转至待办任务页面 @@ -1940,6 +1940,8 @@ export default { }else { this.$message.success(res.message) } + this.saveLoading = false + this.isSubmit = false }) }}) }, diff --git a/src/pages/processCenter/pages/phone/qbrk/step11.vue b/src/pages/processCenter/pages/phone/qbrk/step11.vue index 99e07308c..a7e02c8ad 100644 --- a/src/pages/processCenter/pages/phone/qbrk/step11.vue +++ b/src/pages/processCenter/pages/phone/qbrk/step11.vue @@ -1914,6 +1914,7 @@ export default { 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); @@ -1931,7 +1932,6 @@ export default { this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // hwh5.close() this.$router.go(-2) // 流程提交之后，应该流转至待办任务页面 @@ -1939,6 +1939,8 @@ export default { }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/phone/qbrk/step4.vue b/src/pages/processCenter/pages/phone/qbrk/step4.vue index 2bdc8f54e..ae823c05d 100644 --- a/src/pages/processCenter/pages/phone/qbrk/step4.vue +++ b/src/pages/processCenter/pages/phone/qbrk/step4.vue @@ -2260,6 +2260,7 @@ export default { 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); @@ -2278,7 +2279,6 @@ export default { this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // hwh5.close() this.$router.go(-2) // 流程提交之后，应该流转至待办任务页面 @@ -2286,6 +2286,8 @@ export default { }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/phone/qbrk/step8.vue b/src/pages/processCenter/pages/phone/qbrk/step8.vue index 61547c122..d101fae88 100644 --- a/src/pages/processCenter/pages/phone/qbrk/step8.vue +++ b/src/pages/processCenter/pages/phone/qbrk/step8.vue @@ -1970,8 +1970,6 @@ export default { this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false - this.saveLoading = false // hwh5.close() this.$router.go(-2) // 流程提交之后，应该流转至待办任务页面 @@ -1979,6 +1977,8 @@ export default { }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, From d099d9ca7c14634ba7107687592bedc7c3c9e0ee Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 13:33:36 +0800 Subject: [PATCH 50/70] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86-?= =?UTF-8?q?=E8=B5=B7=E8=8D=89=E5=9C=A8=E8=BF=9B=E5=85=A5onlyoffice?= =?UTF-8?q?=E6=97=B6=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 7c6c29c56..6ed9da8b0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -2977,6 +2977,7 @@ if (type === 'preview') { this.$onlineEditPreview(id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, this.form) } else { + this.handleSave() this.$onlineEdit(id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, this.form) } }, From 57981cf8bc5c461eb0e8ffea657406b4e2fe8e69 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 15:04:14 +0800 Subject: [PATCH 51/70] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF-=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../phone/components/standardSystemPopup.vue | 15 +++++++++++++-- .../phone/components/standardSystemTree.vue | 2 +- src/pages/phone/domesticStand.vue | 16 ++++++++++++++-- src/pages/phone/phoneHome.vue | 8 ++++++++ 4 files changed, 36 insertions(+), 5 deletions(-) diff --git a/src/pages/phone/components/standardSystemPopup.vue b/src/pages/phone/components/standardSystemPopup.vue index cd5c6d868..e2eeab1bb 100644 --- a/src/pages/phone/components/standardSystemPopup.vue +++ b/src/pages/phone/components/standardSystemPopup.vue @@ -10,6 +10,14 @@
+ + +
@@ -31,6 +39,7 @@ export default { return { popupShow: true, checkedKeys: [], // 选择的标准体系 + textStatusName: '全部', standardSystemTreeData: [], loading: false, api: { @@ -64,7 +73,8 @@ export default { handleOk () { // if (this.checkedKeys.length > 0) { this.popupShow = false - this.$emit('standSystemKeys', this.checkedKeys) + // this.$emit('standSystemKeys', this.checkedKeys) + this.$emit('searchQuery', { checkedKeys: this.checkedKeys, textStatusName: this.textStatusName }) // } else { // // this.$toast('请至少选择一项'); // this.$message.error('请至少选择一项') @@ -81,7 +91,8 @@ export default { }, handleReset () { this.popupShow = false - this.$emit('standSystemKeys', []) + // this.$emit('standSystemKeys', []) + this.$emit('searchQuery', { checkedKeys: [], textStatusName: '全部' }) }, async getData () { let url = this.api.getListStand diff --git a/src/pages/phone/components/standardSystemTree.vue b/src/pages/phone/components/standardSystemTree.vue index d5f0098f4..3857acee2 100644 --- a/src/pages/phone/components/standardSystemTree.vue +++ b/src/pages/phone/components/standardSystemTree.vue @@ -9,7 +9,7 @@ :lazy="false" :show-checkbox="true" node-key="id" - :default-expanded-keys="data[0].id" + :default-expanded-keys="[data[0].id]" :check-strictly="true" :expand-on-click-node="false" :check-on-click-node="true" diff --git a/src/pages/phone/domesticStand.vue b/src/pages/phone/domesticStand.vue index 3a49c4082..9ce0d422b 100644 --- a/src/pages/phone/domesticStand.vue +++ b/src/pages/phone/domesticStand.vue @@ -34,7 +34,7 @@
{{item.standSort + '  ' + item.standNumber }}
-
{{item.standName && item.standName !== '' ? item.standName : item.standEnName}}
+
{{item.standName && item.standName !== '' ? item.standName : item.standEnName !== '' ? item.standEnName : item.nameshow }}
@@ -102,7 +102,7 @@
点击加载更多
加载中...
- + @@ -131,6 +131,7 @@ export default { textStatusMap: {},// 文本状态id与name对应 natureMap:{}, lawsMap:{}, + textStatusName: '全部', standSystemKeys: [] } }, @@ -190,6 +191,7 @@ export default { selectIndex: 'stand', selectValue: this.searchKey, standSystem: this.standSystemKeys, + textStatusName: this.textStatusName, selectType: 'titleSearch', standType: 'INLAND', page: this.page, @@ -227,6 +229,7 @@ export default { selectIndex: 'stand', selectValue: this.searchKey, standSystem: this.standSystemKeys, + textStatusName: this.textStatusName, selectType: 'titleSearch', standType: 'FOREIGN', page: this.page, @@ -249,6 +252,7 @@ export default { selectIndex: 'bussstand', selectValue: this.searchKey, standSystem: this.standSystemKeys, + textStatusBussName: this.textStatusName, selectType: 'titleSearch', standType: 'bussstand', page: this.page, @@ -355,6 +359,7 @@ export default { selectIndex: 'stand', selectValue: this.searchKey, standSystem: this.standSystemKeys, + textStatusName: this.textStatusName, selectType: 'titleSearch', standType: 'INLAND', page: this.page, @@ -410,6 +415,7 @@ export default { selectIndex: 'stand', selectValue: this.searchKey, standSystem: this.standSystemKeys, + textStatusName: this.textStatusName, selectType: 'titleSearch', standType: 'FOREIGN', page: this.page, @@ -440,6 +446,7 @@ export default { selectIndex: 'bussstand', selectValue: this.searchKey, standSystem: this.standSystemKeys, + textStatusBussName: this.textStatusName, selectType: 'titleSearch', standType: 'bussstand', page: this.page, @@ -572,6 +579,11 @@ export default { onChoose () { this.$refs.standardSystemPopupRef.open() }, + setSearchQuery (searchQuery) { + this.standSystemKeys = searchQuery.checkedKeys + this.textStatusName = searchQuery.textStatusName + this.onSearch() + }, setStandSystemKeys (standSystemKeys) { this.standSystemKeys = standSystemKeys this.onSearch() diff --git a/src/pages/phone/phoneHome.vue b/src/pages/phone/phoneHome.vue index 0c66fc044..0d15d352c 100644 --- a/src/pages/phone/phoneHome.vue +++ b/src/pages/phone/phoneHome.vue @@ -40,6 +40,7 @@ 标准化动态 +
系统开发中...
@@ -199,5 +200,12 @@ export default { font-weight: 500; } } + .footer{ + color: #3170A7; + position: absolute; + bottom: 10px; + left: 50%; + transform: translateX(-50%); + } } From a465ac2243baad3b1826e6b660b287c915fdfcc5 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 15:57:56 +0800 Subject: [PATCH 52/70] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF-=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/phone/components/standardSystemPopup.vue | 4 ++-- src/pages/phone/domesticStand.vue | 2 +- src/pages/phone/standDynamics.vue | 10 ++++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/pages/phone/components/standardSystemPopup.vue b/src/pages/phone/components/standardSystemPopup.vue index e2eeab1bb..a7b874164 100644 --- a/src/pages/phone/components/standardSystemPopup.vue +++ b/src/pages/phone/components/standardSystemPopup.vue @@ -39,7 +39,7 @@ export default { return { popupShow: true, checkedKeys: [], // 选择的标准体系 - textStatusName: '全部', + textStatusName: '现行有效', standardSystemTreeData: [], loading: false, api: { @@ -92,7 +92,7 @@ export default { handleReset () { this.popupShow = false // this.$emit('standSystemKeys', []) - this.$emit('searchQuery', { checkedKeys: [], textStatusName: '全部' }) + this.$emit('searchQuery', { checkedKeys: [], textStatusName: '现行有效' }) }, async getData () { let url = this.api.getListStand diff --git a/src/pages/phone/domesticStand.vue b/src/pages/phone/domesticStand.vue index 9ce0d422b..abdee82b7 100644 --- a/src/pages/phone/domesticStand.vue +++ b/src/pages/phone/domesticStand.vue @@ -131,7 +131,7 @@ export default { textStatusMap: {},// 文本状态id与name对应 natureMap:{}, lawsMap:{}, - textStatusName: '全部', + textStatusName: '现行有效', standSystemKeys: [] } }, diff --git a/src/pages/phone/standDynamics.vue b/src/pages/phone/standDynamics.vue index dcf1cb6cd..6c469e87b 100644 --- a/src/pages/phone/standDynamics.vue +++ b/src/pages/phone/standDynamics.vue @@ -199,6 +199,8 @@ export default { this.page++; if (this.messageType == "ZLZX") { this.getAdvice(); + + console.log(this.$refs.cardBoxThree.scrollTop) } else { this.onDynamics(); } @@ -243,6 +245,10 @@ export default { //获取数据 getAdvice(first = false) { this.listFlag = false; + let scrollTop = 0 + if (this.$refs.cardBoxThree) { + scrollTop = this.$refs.cardBoxThree.scrollTop + } this.$http.get("fileMaterialCenter/file-material", { page: first ? 1 : this.page, pageSize: 10, @@ -255,6 +261,9 @@ export default { if (mList.length) { if (!first && this.standardReleaseList.length) { this.standardReleaseList = this.standardReleaseList.concat(mList); + this.$nextTick(() => { + this.$refs.cardBoxThree.scrollTop = scrollTop + }) } else { this.standardReleaseList = mList; } @@ -322,6 +331,7 @@ export default { mounted() { this.onDynamics(); this.getAdvice(); + this.$refs.cardBoxThree.addEventListener('scroll', this.scroolThree); //从数据库中查询下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", {}, { _this: this From 8d3a900919eb6108a41bab4096c2ace4d58f2bc5 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 17:30:57 +0800 Subject: [PATCH 53/70] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF-=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/phone/domesticStand.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pages/phone/domesticStand.vue b/src/pages/phone/domesticStand.vue index abdee82b7..55956c73c 100644 --- a/src/pages/phone/domesticStand.vue +++ b/src/pages/phone/domesticStand.vue @@ -131,7 +131,7 @@ export default { textStatusMap: {},// 文本状态id与name对应 natureMap:{}, lawsMap:{}, - textStatusName: '现行有效', + textStatus: '现行有效', standSystemKeys: [] } }, @@ -191,7 +191,7 @@ export default { selectIndex: 'stand', selectValue: this.searchKey, standSystem: this.standSystemKeys, - textStatusName: this.textStatusName, + textStatus: this.textStatus, selectType: 'titleSearch', standType: 'INLAND', page: this.page, @@ -229,7 +229,7 @@ export default { selectIndex: 'stand', selectValue: this.searchKey, standSystem: this.standSystemKeys, - textStatusName: this.textStatusName, + textStatus: this.textStatus, selectType: 'titleSearch', standType: 'FOREIGN', page: this.page, @@ -252,7 +252,7 @@ export default { selectIndex: 'bussstand', selectValue: this.searchKey, standSystem: this.standSystemKeys, - textStatusBussName: this.textStatusName, + textStatusBuss: this.textStatus, selectType: 'titleSearch', standType: 'bussstand', page: this.page, @@ -359,7 +359,7 @@ export default { selectIndex: 'stand', selectValue: this.searchKey, standSystem: this.standSystemKeys, - textStatusName: this.textStatusName, + textStatus: this.textStatus, selectType: 'titleSearch', standType: 'INLAND', page: this.page, @@ -415,7 +415,7 @@ export default { selectIndex: 'stand', selectValue: this.searchKey, standSystem: this.standSystemKeys, - textStatusName: this.textStatusName, + textStatus: this.textStatus, selectType: 'titleSearch', standType: 'FOREIGN', page: this.page, @@ -446,7 +446,7 @@ export default { selectIndex: 'bussstand', selectValue: this.searchKey, standSystem: this.standSystemKeys, - textStatusBussName: this.textStatusName, + textStatusBuss: this.textStatus, selectType: 'titleSearch', standType: 'bussstand', page: this.page, @@ -581,7 +581,7 @@ export default { }, setSearchQuery (searchQuery) { this.standSystemKeys = searchQuery.checkedKeys - this.textStatusName = searchQuery.textStatusName + this.textStatus = searchQuery.textStatusName this.onSearch() }, setStandSystemKeys (standSystemKeys) { From 6d331c9d5574474ecb5b996b4a7f93e3b75e8bbc Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 21:53:24 +0800 Subject: [PATCH 54/70] =?UTF-8?q?=E9=A6=96=E9=A1=B5-=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=91=E5=B8=83-new?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/images/new.png | Bin 0 -> 12100 bytes .../home2/components/releaseBuss/index.vue | 9 ++++- .../home2/components/releaseBuss2/index.vue | 9 ++++- src/pages/home2/index.vue | 31 +++++++++++++++++- 4 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 public/static/images/new.png diff --git a/public/static/images/new.png b/public/static/images/new.png new file mode 100644 index 0000000000000000000000000000000000000000..1a42268e44cbca2b9241d37642e75856a8193d9b GIT binary patch literal 12100 zcmch7WmJ@3^zIBGB|U|0snVnV*1oC5SEDA;$)@qDy1BIl%*t0W;%n~S>p}~vi3@6DZ?Sc&Sv$7baK`lv`ao`&5zn2ibx4T9wM#Y_P$=t1gmgKKGW)r0subQ`LX=rIo`(Cdwjmb}+$8jEjmO0;TVe zOb(1dUm_wj1`;>2&;|cJstJt=rk3t%B>PmsKo0@tL$Dx@ZyanWljYyKD4asjlGE3u z+IUcSim1Fl7X(NDEnTum#EW;JQbp1y!jcl$z}^OtAY-n#&PsXXr$snplhE%btT`qZ z+dm{u1$|kdAtd;>iun@BCV}Se5s0mgC!cg#u*4(TIVSJ3w{mc2vHl{GEe6Dr%<#k@ zKb4%)NVlu<{*&zJ|{7otY#vPOv#oSHCaROXoUrK;H6GovDvB5{7y? z!Wg(f(#7_kN8%=+nu&i;QFH6DB1mgW+D2}TQxg1^$d#3hkUxV)p)n<&hChyyXPG(HY?kAEjp$^kA}n8zaX zzGqN^F=>tQ?p@sxzLn$-hcbOH?pcF&dvBP4Z1rSOo>LeqB;%ibL*)&otm`wrZl|NW z1-QeVzoG=hO2d$9G#A#Gjpo&5kZ57*dHYm)=38qfL}EN=_PN*0P`n>Jw6w0H-(XG! z$$PNv8N3%lo;j1vJ(T!cYo#FP5GM1_2QncB&G}^8$r5g=hud7--NLO!__Jb%!Uf#u zb*i0uR@R=7&I()IRFiT8V#uxKvHdEs*%L!prsQ1Q;yv;>{D`BmFN>lVF1w)+2gh8< zhCI*mWmWwc`!6jdn8zcN{@)=x;JAI5l_cT_Dfsc`nsP#eCkPINR~5PED4lncww3pS z!54a_e@ij3-NL<6dtxlmm(la)BjivV7eXMHZAzK9WRJBq{;iRuD=rD=%3vV*cXp9PU`*~bV{zr? z)oMk~QorZSCkWqG#X2Kh*n6$K@p{(yV8;94yP#Rdc>d0u>0(Ba_rW7EQtviwSD#Qs zMKEE4zST9;|6Ilz?nMCpoM8ThH_8)CO|2dJgNNU)n^arje{0EwrpM)qn-I$0fvsr5 z=ey}pz;X7I-gjk7w(*~LFe)q#8C`GqoZ4$?YH!@aF=Ju zp9SLHc{H{Q#r;3oFus|gWA>UN2TQS>9%|&DX?~aBJc4}_WC`)(WACCu1|6Cay(q7yO8)KUv^E&+uwj0Bm5AG?jE~sC$iqPcxx70kDJLd^$jt=Hirzgv zqNjxpzYJjdihFCIVQC3CqYVT7(f`X0Bc&nk(??^EMB87r~m%R{=Rk9)~6BM3UOD?;A5jq3%oQ~pE7sh z7)m=#1K8%>~4JZTiQd(nG&w#c6R&c5y9Pfy}~VN`p91*?P5)3zT*n z;D>UY#}r@f2GFacwYR<>SUxYhSJ?YvY;%&Kds>`val=8uP$zca+o!s#k27wF5M-!~ zd0qNP9~=R+3t^DmkeulvkEy=bYv#%sEaeOEh6+<)I zn)to7`yhA--ALHzyTrX~N5w1dyiPy>QM~ilu&ZY^jpxqoDd8VIm9BAp2L>$?{C?N8 z^ez3Eur5TkyRvn%9n<`pt&NxPw49JQP1RPl8xH>?nUNq1+t6!iycZZ8ApaO~)hWQh zKQ^@YwWH@5lkGLrFg}4Vi`yHZ8oQEocqm;fgPNc?JK+}G#V)8VwUM1S7tH+z1r-mP z?@tek%^Z!H+N>fNJDj#3qYJVa85dyv7^l1c=Q>pV;e(RibJVCW zsL`Hs70r-}E}zs@teq%U>N+^ye3mG&Q~irGp)oSkr^s8R(szT!RKD~tc<5G+Wcx&aYg|7mKImsGdF_qv>PUg3ueUN-ZBh%)*%W!oz zMe*r#$1qdM`uOOFGG07p!X`8yv}RkbY}E@&?l9;xeyn-Ah4DV52D1gLB6(Y=S^2QUSC5RNd48E^VE)~{P2VG^L3efT6P2sFz zD42>R{V{GB1t%qX+k*YoS{E;x2#Mp3U$^30tB)ftMS}R1Xh}RiZ;aik!}@FD{JjW? z^$aE1q$mli8@aiE6snZ^ya=r7+@aDQXIE90DYF6>T5{bmCggTbWLCvqbt*a_;J-bU zcKLk?BJv)VqwyiGS)W5xyWDCMf}tt{W$Ea9lKp#SZRA}wh$AWnEiS2gNn5&LvW{3V zWZujOO7gJ@o9LR>eU`H5K*@alr-8ew6mGSY6gAzQ} z?Y4TJ*!o0wGh>vnoCUacjva>_uQ#7c>ZEdtLpA{`1*Tg|fjkZzIYTXM39sQ0(_F-Gs%GD2_ z?zgnqlzor{x4yJh+_8f7mIedcfE1VIOq_mTTvtUegw}3pW?426xswd7JP-+4szba9 zEkZZwfNzguZ#Pk#_ckO}jVhQG!A|>2*gmgM&J)a_$iD@)-0$`N3r1J5k#oCu!Awie zWlpc7lAkwF`9`)?&f-0Z+}w5{qasGL1g4;UcuDJ67fn+;OgJ!QgS~3}^n2bo&>5go zR}?ph|9+G|TKf$x&$MJbKabvUtQt4BaEwKFDpfXeT-W}=({0;nceF8*0siaWz4L+uOJv{&Z#&J3sR{5bu@-U z`I{V{7{V3e#8~EsH{vgJ)M*UWrcA=MG1u*QrAy&BM;aFXD}<*!+7n*bE?B0fA}L2$k7jT}Fjp)Cj;K-}bNp8S zB+6cz*Y@|W>4r8)2D zqf}v+FRA_=Fy3#7pD++FOB+_4I`2cPSW`wAydArfMhaV;d^SVuy8*{I(=!$ zI@^fOP^HH6JmH!Jo{jG8Q#=&6;LM+KfxwTVh}C>DM|}!mtd72;1znlDIB_0XutN&g5P4vdDC`%jzO6R}|y5HbQA+Pi>esYqVTQ z*~n&CbdOqi`?bdu?!9OJAk{XXGlUf$-OS3qy*%Ddua8HrbC$^eV}s-PmBG#4KjH*ji=0 z;H&rQjd5^opVu)?nh3J)e+`GN6mLZ%eOr{jjHT%7h2`@7v}S|BvpKBuA%%j*2Lxd%?|W z+I0dZ`MBi+Fw*3{wp=CRit6rGNn9k|zW+jS0`71-T`i|A3mLJD8SP&69g6ZGq~FNd z{&v0X)3i-~x=pNeRLE4ho{oQIgJ!Ncn`)Nz3xFr&>zFGo0#bdalzickbQw=poNWkDQbVpn`W8r}XF84*ex((idE~g6; zN&a#QK{wEIgR?k6&Jwt1Tb1K&1hdj?-&pSEzi+(w3Fx14`VWamf~xFr1hi*60-rkU zO{;kA5kRz32ZJWdyh_}erw$UxVrlt;bwY+>!Ze1`jdZ;U8vrW7*6Qps@J`;EHv69M&I-R%SOVZkj;mWWQ^!31tcN@$*;|A zoa=~IsH8i|fr9tI?rDpY;|=;CF_--Lf?DhPY*KA^u=+<>JB(K%w+F_56&1WPTYDZR zy}1$;j12wsEf)>0l+Ltx8C~*}6Py9mIrt)#qB+H2_54v>)DO-2*4537mOX48?pL2* zukgQ$hz|tZFlRIodr!Ht(Ca4~mbzuExLI(5td9TYPl5VKJJTKw&%{ZWtba8-CosNj zgt{R7${q8Uz|b?y8|5iGXan6>q)OEgU>J!cNeE85G}$`O7O6unIONuIL?3Y1o2@#4 zc*0_B4A3Roy3Qy!$pXYwj;R(x7|cAp2p~$V6QdOlmRr)rfGkI9N!^3m9Orsdb}7X} zA6~y~hb<2(yesZ$3I|_K9*ub}AC8VH4LMkn)18zQmmEiAZIWIPU}05t3{A2Mlv#`g zZBf0E2E5o_OVOnI5Tc|1Vcn(*fkc*n;24t&S{Uh?f7-q(ZyU47(st1yRM+LSeS^7Y z3*qD1s55OcG)qMy{prntlWCU!f#fWuyHCyArJ=xA`~4+g6p_*4^cA6+88G+v6B0k= zXJ`GD>WR-d)(A=y9&y69y+L(oPZEb#?5e&08t<4>q~T!YEJixo?4`L_Zn}g6UV@!H z1#3N^&}{U6wNq!0&u{MhE*XfAZ|xooja#epZ5fX#@{b=)XxPxaf5Wlb*a5pS%qCd# z!FucN+hhhKbhDjPJBoHua^ig-t}sx9Kb6!3eCb?*3xr~~6;WKGG`JC-Agd-TN^a*t z%E!H0%SJi&NLw^2A8G21&64`a3kom{;)Kxt5Ad;@S##*s_^{?hP ziR8~Bk_1$qgV$rZSmF;KPuUVQi3 zu`~Dzi7NQ=hcM0fhPrtMe{+8Md~4&0Rs`9OW3xHxXkT`Rm#43sQvbQ|Wg{8~~@ktZd+e{!c^1&IsOgRd%CqKJdk(a`3;Ktf$4$Q`K@BH)kA|>+9 zR20vOw@mc=OZ&E4VC9u+R`5^Xb%WO@tI*uq+z?xrv;K%x9iK&?)=5h)p9ee(g)zCr z5Z@p7su~T$q_(&+h0{iNGDnTlM2K8YL=Zz9y!aZlx@p>B zOSU;v7?>`m^C}kuTF7r=)q7bs{*D(wQVWPlK*pA`*_A(LG^muOc>NO7ZxOL_)kOqBhEz1T zLC@`L#!p>5r}n?Yy^}#3#>ETde{pJu(?w(1Q4#z3^C_aWU|cVq9v6M&Ae^Lfgvf zC3n4OYo}#JnyY8R)$X4ubM9;4R|q_ndAY;*6zCQG1mz$&$pW4UgU2+>;<1-\G- ztk6scbaGq^-qBdE^j43Tj?>&Z6QLOGSicJR9#iLm+SqEkE<40#)dl&+yOI8QVl~?W zB^3CDJv-V78-0#NhCd_A|9oIXyKTRqHuQ!#&;h^67HR2I&Ke;gtF2&iJ|NM&{OQh? z?8DFaP_A>8VzK>lN2TFxDGGNFfHGQ~-()XKkGtyp z!cZabJnKM==Snj2wdHgQGx5`;?K8G8D0kFDs$#&Mm(L?T#Gy8&+fsOa%FD&m9%)zO z=MeWYLlSCZ3vL?JIF&&AusP4v-m{i>y7~=nFo?r}E81l~fA1`RSl5l&D*zIqtL(g@ zE!K{>XZ5G%TB17cn*Xy#-_65T8;w34f$Bzi6Unf|gUq~cqnG%4scs}Vy>8j!;xpgf zxWF-dKSL-FoOxoBo34Ipx|1M7%C1gnGiv^-^Tk(`5Iq}NMUjI<3hg+b8_QoL`?Vw* zEJ-^*1V+G`B00h)g7>Y1#~cQ&Ge7x`dfl=T)3$lVklD6nhPiOYdJa50(z3Z!X;;xD z0X3R%*wYkF`L;H^buM(41+`N3)P zA*XF+bk2&CQU3c>ZRdE(aC6TQ8HSa3U!dQ{992r{&PnD!v7whYxjsGi)Ir|XJu}H& zS1&{)Mc%O*p7QHCv#X$`xLHL?wGjoYJ=fGU^;~1ZU(-uiE)1%6iJM`+JyuSVXNm=D zZWJ;mfQ;Y`znB?_D49#e273J6RQ{-?IpwyK`ku>SL+bVMvB7+8F5)n%W{F^_!?l`< zpuDTJ>Edpu?b4vEX|hSyD2jBBi7}>^Cs8d|g$erwj=EC95e>_e0>nfX3>{qLmwiWL z$d`7QxG}i_m>OVONFV#Blk~dpXBrSKi`zm@j#NtS9`yNnEypuy`GJZrX;RwrLhm|; z!z%sYr(fJ%x6(%hy&iBZI_pW`mL3-EB5-ZOcWvQwu$g)a+>+RfAc{C%cUlSle59+L zMiz3cjokmVU(V;#Xlm*`RyJ_IN_VJ_N+h&wvZ&xH)cmU~QVZMgB`GgEyU+8;kMqd!smWT6U->EAIWEDE_)D_(tq^S;2=gOp>k#gK@r8?D(fuJN?#!?+Nkxf-dn0u;Q< z!V%qJT*a6}FF`({j=SABQ3D)P2R>gDE-X)9%)g>J2`K#0+_DpNSbjpoGpg5RvML9I zRDAghQ?F~>ny_|M(Cp~B5l3s{w@lM}K4)sA*ObsrHmv}vy-)F;V@uB0V}(@w=c;}< z=vvO#&eBVjEko$9248&DNUsdFr#B|HJ~+9ym1jWTLU#LMaS5Cz+w>bF4>$A=Gxy;q z7y71Ol!&q=&9)kowWlNBU;HHoF+APlc4BK+mCHk>G{=)Z8b~@dt-#b)_qN|p`RyjQ z--*Y&D0JKgA|sFFe)0mCSsBKILeh*E?k^eyNKr&tu8TxO1&Po`OGBpeCXk{0YkFmW zIPHnjw#`f^vo<|%^G8BO$SpLdc!HqcpqPgb;*l(?&S~)g-=jx&0w(h6g1-n-n-(M; ze$`78CAWfN=ZbnAG{5>nJm=3-F5(eb%otC-Sv#x@MTKASZWf;v-wtGvsn2=j( z6AW}?5<6=jkBWMYee>^Np^+zbS#&wqS^q9PxL?;lM}{f_LE26r^-0(pdH|bVHop3>}AVB|~KnB54DC%q8jV*hKPVT@U6Sm7pLJy6`9*0R4 z+`ABjUa}5J^L8KuCgQgOT+M?bDAW<>;RbjO=ZbA(N2$2cLA1bRBB%%@i5ID7K+S=^ zQ~q`Z#^Y>;gfM>Ya-Pbi6|UWBx7M>8Rvn}##8PmR*Q2-~�DNF5uN%3(+DP`ueWt&a{1iT=q0jsFCze`_lY5L zcs9$eq|7&lXs)Kp%+UG<9n~CurP*;9?y(5c-ewsjV`<=Df6yz#B!~Q&5szxyXC^r5KQ2Lg2M#5}uCM@t9Dm zZ57oHkaJ%t*C7LS0TA;YX#UGkDonB+_MyXt6$BzUxa9(nv`lloj?u0`Jxsj>E9!Ci z2qlPr(~n7%tt@=I^!mQp=x`A|fB=a#7|@?6cdhDvKc+`pvvBTl19H4WHVrBKVAAik z$S?rcLYXaL-L*qBEkGc5u<@+uN@c zJ`!I%xBQ}HFiSpA);9I-YqfCg8J<|ywm{vv$J;7(hy!4X2c8|U)?&ACn#N&VeH+9f z31suhE{yW;9Vi!suMV|#P-5FmW;Gtf5-19iRD>F4>du%lLqQ#mti ziH~6b`bD&`=I7BHx))ckzlwHwqcxYePn+p%jE}h^H*?hl!r@L}P+xq7Mito-e$%qz#^>jAOXpz|&}R0dXp8r$Oi-iKN_V&Mr=DwC z{W73!TTPEoDGA-*OwzI5_2#(dDOys$oLl|1vN)sLo|`gdmDM}dY7e*URCu*3xbvwEX|Nx4&U{7OIVHC8#$?GqWe{9$gb zn@c*E8`Xk$dVZL_kZ`V$Qv`|3O-B};-S#MokQP|0tvby`{a$Lh^k;^T0E7@0iWJiU zfF~LX>(3-4Zbv`F?D9m-irOVU*Yb{TFN>Bbh}ntXGkBU#dP5C1o>CFh?GBKcxw9_dTPE+-!h(Pcj2T0+pJ;91y3)c##^+S$t#4T5qGu&&%Ql+_aiG8W}iObW1`Qy3NsZ z6S%|x)U9f;&$eD<9fTEp)XsOgwf+Z_;CTT6j*X030MYqYt4tZ=4nZMtmr8-^8IJ*l zPi|8<>Qc-1Bv`1Fu(nZ{GbbqO5Wwkipx61tWs3T!0hTjXofr~SeqZ;%S3C`4WHw*o zre@WAHC@r~Fg1-^%x$q@-!dnn&U*#5&)a7PbR)&7Azn>pT8XVGV^kW6Ma5O4CaJ+| zZUErP<|_cy91>{_06s2vqg?wg+I7w6YmCqG=+F7qd9~I{?P!r>X^@LfQTcByaDQr5 zei^$BBJ51V%*WfMbNM3(Zuw)E53pBq<%C;XGWWPqsz-PAbWwro%qq9x@bD>PbS;8@ z$(-u#S^wo9+lI5$@>x+moI0Z{nrr{y8_o2kD|xo0rK?tR#t#db2c5mf zVmirDd2xjdv(wEx9>Ky?ze%?T{Ow;S7m20z<~N8`Kpc|!To@JMFv#CM{;8#BJ@sZk zj}4Wb6ykms>^mo)A+z7S`+fYI?8D>dGh+J5e!q)Lw5!qA7x|rG>lTBN{Zj(I`q`>a{&sLC@na*Qtit)zUd9t#A=gr$PM6Or%-q`jb=ok7PYp%K zpa;Rm0|Ov&tXJdppLTO-|Ar6ehZXRx)RB#M!c(+?>XWM0k`~j%vl+$^lkdegN9wLX z!)e8ohLX^xv7_fDEid%>r9Y-Qzu$>3Pz}(vR?oL5c`#~fwK(5Fm$7H#C8cYVr6&_Br*_L;V5>|j*k!?ht zjeYlIM?wVI?01OC|8PsD%cG@*Mu!+i(%(^88ssG4*#cdP`DADS^&;CJP@gsEMaUgh z>ktaCIp(Pa^0fZHZ3yVy?NnT%H<~Q?^-h)MUs3?{3wZh!)I%}NxCFd6Tx}Gfs^;CI z@~v7p`acF;56L&Ozjj7z+VFCcB-ssVtWMJ2a_$d81p>t(1q^5Zkz3foB?%(;;0ppn z^5*mcAU6daF3e}_7yVev|AQaX%r=>RZ;2jK1oW-|2p?K)gdx_jD$w*$L+0Slev-6r z(c=8C?$g(g!PwLg+keTcn|&w$Z}N{H(_e#k6H^1=1d~jheBqiA@VM z$yDxREs%*sxz@qhb2Kz`Eqc1!RYYi*IBIuIj3xoCF)ZHUDAK|0AJ`-ro4BA+EZ}1< zsla=;QnH!aPk!i{g-eO|t2uFldp9iq!(~_EsW?7PiI%{dor*m$Fa9Pn^p>Y1f!)qn zT5j;H6q~Rsc1qZ51)xIBL?ZFTmkT+Wm4K|?HYy_EWQvTwU2MS2So-fW@)Ial5s{8_ zldGfpXZC<5dwG(Oq_imy6Lg+{5@^-Z^1{;j*19&l zeHFK}h%$akD@aCh^={>BY_*ijxFw^#Cqlwy0aRnf_s5Oq$RO?j;38tY&z-s|%N6)( zE=gEGB^={FS`|B5ui47IqMR!pPJl)=*xfS$BxJG6A^s5$0QE=5R8q=lStz7Z`=bS9 z1Cl|qJ3gx~(PT*TcS-L*<2m;}crt^ai)3-V1ym8c2K2pV@GU!2tqAmProp`!S{)_D zqts!_OHr^_)Pq|?ZI5Ea3mw;!Ex|eGaWbCakpG+AY{use{R}H2FK{7V+{jJ=EAABy zll}ft>uYH|Cb{8Tj%zcFdCz?4X_bTwWJSmPcg_HjDS?9Mo%QoiJ5gGoK`A2Xtvuw>*#xVppK6WPmQ-H*xn&**a)X#*{_M=D9gx5{FJS1@+p3cR5a9(GYT-kn8}I{rZ)8td#O ze(}$3H%QTXAB^?_%%yGFdl7Y4p3G)eN4Ro%s<#`I#t^&3bD(^00hp{KPaTM%?<2%E z6}j7AB~0a7HVi<{$wVC9ME{q)6)m2f{+z|gz@8&-xK?`E4PK|12+!-yx;uw^N7oz} z^OFy;<90R19rbE;>22M1q7|PVTB-f>*Jm~VJou0seEtn^ySx!}8wgHEYhF`W^EI*W zm$0f;k~>}eaHJO9BacdKZ5CbT^rX0>`ZLpv)9)>QlBo7j`HvZx0K$0G%h}+d)UdA^ z+Xygu4bjJpuAi7)Q~0vHri|76r?o7NpEggWN7r$|5F+1t1{M@*a?5D8rJiq-$`wWa zGo7C^@u_2vMmp4YhJ`I28Hi8NKTCfBp$#ml7Ot=`7V(Os{`YO<(B?o-9**mc**E>3 zD-uW>`edpSVAStk6H|cS5YRr(ebVzEJ=g@BXb+pmtFuVJmU9RoK2PcN9c;$n_FJPQ z(dHQ*&nx0Znctl(9+AN*C|y5apoET=GeeNka2Ce@aIOF6XU=YBzdbV0MIx)F^FKe4 zNNyGeEpgQ}xp*BJ?-XMDArrgD`Pey>yz@wTBLbwld>s<%cSATON$$vh!O|I>eFETd ze3bt1X`8IbAL$q>ky-}mcLWZeNq&deM;s}PqRe}&+=kGEPasn81JEQ?ghlJtnf!2I yixwb0v(eycOwE@!1pXSCV}-XwW8tZZ8^ZE7DF!~%oM#~5M@~u!RxD}Y|Gxmf4Twts literal 0 HcmV?d00001 diff --git a/src/pages/home2/components/releaseBuss/index.vue b/src/pages/home2/components/releaseBuss/index.vue index c6692f926..b10488fad 100644 --- a/src/pages/home2/components/releaseBuss/index.vue +++ b/src/pages/home2/components/releaseBuss/index.vue @@ -32,7 +32,10 @@ prop="standName" label="标准名称"> + + From 5622837d7ee580c3c47e0014e3154e6a7ca8ac7c Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 8 Nov 2023 09:12:31 +0800 Subject: [PATCH 61/70] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF-=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E6=A0=87=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/phone/domesticStand.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/pages/phone/domesticStand.vue b/src/pages/phone/domesticStand.vue index cc9a0c3d2..5b3c6fbc8 100644 --- a/src/pages/phone/domesticStand.vue +++ b/src/pages/phone/domesticStand.vue @@ -34,7 +34,8 @@
{{item.standSort + '  ' + item.standNumber }}
-
{{item.standName && item.standName !== '' ? item.standName : item.standEnName !== '' ? item.standEnName : item.nameshow }}
+ +
{{(item.nameshow && item.nameshow !== '') ? item.nameshow : (item.standName && item.standName !== '') ? item.standName : item.standEnName }}
@@ -58,6 +59,11 @@ {{ lawsMap[item.lawsTextState] }}
+
标准状态: + {{ item.textStatusBussName }} + {{ item.textStatusBussName }} + {{ item.textStatusBussName }} +
标准状态: @@ -88,6 +94,7 @@ 发布日期： {{ item.issueTime ? (item.issueTime !== '' ? $moment(item.issueTime).format("YYYY-MM-DD") : " ") : " " }} 实施日期： {{item.XCXSSRQLAWS}} + 实施日期： {{item.putTime}} 实施日期： {{item.SSRQ}}
From cbce8391a6f22fefb23e9409dd91a4c6d6550f50 Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 8 Nov 2023 09:27:42 +0800 Subject: [PATCH 62/70] =?UTF-8?q?=E9=A6=96=E9=A1=B5-=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=8F=91=E5=B8=83-new?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/releaseBuss/index.vue | 2 +- src/pages/home2/components/releaseBuss2/index.vue | 2 +- src/pages/home2/index.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/home2/components/releaseBuss/index.vue b/src/pages/home2/components/releaseBuss/index.vue index b10488fad..7f66b2317 100644 --- a/src/pages/home2/components/releaseBuss/index.vue +++ b/src/pages/home2/components/releaseBuss/index.vue @@ -84,7 +84,7 @@ export default { }, methods: { checkTime (time) { - return moment(time).diff(moment(), 'days') > -3 + return moment(time.slice(0,10)).diff(moment(), 'day') > -3 }, pageChange(page) { this.page = page diff --git a/src/pages/home2/components/releaseBuss2/index.vue b/src/pages/home2/components/releaseBuss2/index.vue index f11aa7e52..010ce5fe5 100644 --- a/src/pages/home2/components/releaseBuss2/index.vue +++ b/src/pages/home2/components/releaseBuss2/index.vue @@ -88,7 +88,7 @@ export default { }, methods: { checkTime (time) { - return moment(time).diff(moment(), 'days') > -3 + return moment(time.slice(0,10)).diff(moment(), 'day') > -3 }, pageChange(page) { this.page = page diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue index 4f115b44c..cc0844c6b 100644 --- a/src/pages/home2/index.vue +++ b/src/pages/home2/index.vue @@ -108,7 +108,7 @@ export default { }) }, checkTime (time) { - return moment(time).diff(moment(), 'days') > -3 + return moment(time.slice(0,10)).diff(moment(), 'day') > -3 }, handleTabClick(tab, event) {}, //退出登录 From 056439a6be8807d40a331765beda80147167a5ef Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 8 Nov 2023 14:14:02 +0800 Subject: [PATCH 63/70] =?UTF-8?q?=E9=A6=96=E9=A1=B5=20table=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E5=88=97=E5=9B=BA=E5=AE=9A=E5=AE=BD=E5=BA=A6200?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/release/index.vue | 1 + src/pages/home2/components/release2/index.vue | 1 + src/pages/home2/components/releaseBuss/index.vue | 1 + src/pages/home2/components/releaseBuss2/index.vue | 1 + src/pages/home2/components/releaseUs/index.vue | 1 + src/pages/home2/components/releaseUs2/index.vue | 1 + 6 files changed, 6 insertions(+) diff --git a/src/pages/home2/components/release/index.vue b/src/pages/home2/components/release/index.vue index 491c9622e..9f9ad88a3 100644 --- a/src/pages/home2/components/release/index.vue +++ b/src/pages/home2/components/release/index.vue @@ -23,6 +23,7 @@ width="55">