From 7f8c5737bc9efc0df2edb95832b40809346eb4da Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 24 Aug 2021 17:38:20 +0800 Subject: [PATCH] commit --- .../pages/creatProcess/bzzqyj/step1.vue | 6 ++++- .../pages/creatProcess/bzzqyj/step3.vue | 27 ++++++++++++++----- .../pages/creatProcess/bzzqyj/step4.vue | 8 +++--- .../pages/creatProcess/bzzqyj/step5.vue | 6 ++--- 4 files changed, 33 insertions(+), 14 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index c38825090..8accf6817 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -552,12 +552,16 @@ export default { if (res.success) { this.$message.success('流程发起成功') this.$router.push('/processCenter') + this.isSubmit = false + } else { + this.$message.warning('流程启动失败') + this.isSubmit = false } }) } else { this.$message.warning('流程启动失败') + this.isSubmit = false } - this.isSubmit = 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 1d19fe428..0ff0abfea 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -221,7 +221,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {inboundLiaisonDetail,processCreateStand} from 'api/process' + import {inboundLiaisonDetail,processCreateStand,saveTaskForPub} from 'api/process' export default { name: "bzzqyjStep3", @@ -324,7 +324,22 @@ handleTabs(name) { this.active = name }, - handleSave() {}, + handleSave() { + this.saveLoading = true + let _formData = new FormData() + _formData.append('taskIds', this.taskIds) + _formData.append('json', JSON.stringify({ + form: this.form, + data: this.data, + commentText: this.commentText, + })) + saveTaskForPub(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { if (this.data.length < 1) { this.$message.warning('请输入征求意见') @@ -378,11 +393,11 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.cid = data.cid - this.form.endTime = data.endTime - this.form.cname = data.cname + this.form.cid = data.cid || data.form.cid + this.form.endTime = data.endTime || data.form.endTime + this.form.cname = data.cname || data.form.cname this.json = data - this.data = data.info || [] + this.data = data.info || data.data || [] }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 4e3e3e5b3..8f2419ce2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -301,11 +301,11 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.cid = data.cid - this.form.endTime = data.endTime - this.form.cname = data.cname + this.form.cid = data.cid || data.form.cid + this.form.endTime = data.endTime || data.form.endTime + this.form.cname = data.cname || data.form.cname this.json = data - this.data = data.info + this.data = data.info || data.data }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 1320b9156..e08b93f6e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -352,9 +352,9 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.cid = data.cid - this.form.endTime = data.endTime - this.form.cname = data.cname + this.form.cid = data.cid || data.form.cid + this.form.endTime = data.endTime || data.form.endTime + this.form.cname = data.cname || data.form.cname this.oldData = JSON.parse(JSON.stringify(data.summaryList)) data.summaryList.forEach( item => { if (item.state) {