From b9a2004888a303a95861fec1d3fcb414c6e21115 Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 3 Nov 2023 09:56:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AEloading-=E4=BC=81=E6=A0=87?= =?UTF-8?q?=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 }) }, // 请求转换流程图