From 25b42d796a82930bd0f166550312c417646b48d7 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 14 Dec 2021 15:19:57 +0800 Subject: [PATCH] commit --- .../pages/creatProcess/bzzqyj/step4.vue | 34 +++++++++++-------- .../pages/creatProcess/bzzqyj/step6.vue | 4 +-- .../tabComponents/processCenter/index.vue | 2 +- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 171ee0437..9ec1b19d8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -573,22 +573,26 @@ export default { handleSave() { }, handleSubmit() { - this.isSubmit = true - var json = this.json - json.actionFlag = 0 - json.commentText = this.commentText - json.spId = this.form.spId - json.spName = this.form.spName - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskId: this.taskIds, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - if (res.success) { - this.$message.success('提交成功') - this.$router.push('/processCenter') + this.$refs['bzzqyjForm'].validate((valid) => { + if (valid) { + this.isSubmit = true + var json = this.json + json.actionFlag = 0 + json.commentText = this.commentText + json.spId = this.form.spId + json.spName = this.form.spName + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: this.taskIds, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.success) { + this.$message.success('提交成功') + this.$router.push('/processCenter') + } + this.isSubmit = false + }) } - this.isSubmit = false }) }, // handleSubmitNo() { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index a38e79e0b..af890f33e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -427,7 +427,7 @@ export default { } else { this.isSubmit = true; var json = this.json; - json.actionFlag = 0; + json.hqFlag = '0'; json.commentText = this.commentText; this.$http.post("lawss/activiti/completeTask", { json: JSON.stringify(json), @@ -446,7 +446,7 @@ export default { if (this.commentText) { this.isSubmit = true; var json = this.json; - json.actionFlag = 1; + json.hqFlag = '1'; json.commentText = this.commentText; this.$http.post("lawss/activiti/completeTask", { json: JSON.stringify(json), diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 00fe29240..e172f1a57 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -658,7 +658,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '部长+对接人审核') { + } else if (row.taskInfo === '标准法规工程师汇总') { this.$router.push({ name: 'bzzqyjStep7', query: {