From 158aa1a8ef24b222b69f19734adf88b88a6f83af Mon Sep 17 00:00:00 2001 From: wxyclub Date: Tue, 25 Jun 2024 11:57:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2-=E4=BA=A7=E5=93=81=E6=A0=87=E5=87=86=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/phone/qbrk-product/step10.vue | 5 ++++- src/pages/processCenter/pages/phone/qbrk-product/step12.vue | 5 ++++- src/pages/processCenter/pages/phone/qbrk-product/step4.vue | 5 ++++- src/pages/processCenter/pages/phone/qbrk-product/step7.vue | 5 ++++- src/pages/processCenter/pages/phone/qbrk-product/step8.vue | 5 ++++- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step10.vue b/src/pages/processCenter/pages/phone/qbrk-product/step10.vue index 0362061fe..bef227a32 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/step10.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/step10.vue @@ -1920,7 +1920,8 @@ export default { this.saveLoading = true this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion - const json = JSON.stringify({ form: this.form, roleForm: this.roleForm }) + const json = JSON.stringify(this.form); + // const json = JSON.stringify({ form: this.form, roleForm: this.roleForm }) this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId : this.userId, @@ -2018,7 +2019,9 @@ export default { }).then(res => { if (res) { let processForm = JSON.parse(res.mesg) + let roleForm = processForm.roleForm ? processForm.roleForm : {} processForm = processForm.form ? processForm.form : processForm + processForm = Object.assign(processForm,roleForm) const dateArr = [] if(processForm.commentCycleStart && processForm.commentCycleEnd){ dateArr[0] = processForm.commentCycleStart diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step12.vue b/src/pages/processCenter/pages/phone/qbrk-product/step12.vue index e5a02c2a2..6d48ad26e 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/step12.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/step12.vue @@ -1920,7 +1920,8 @@ export default { this.saveLoading = true this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion - const json = JSON.stringify({ form: this.form, roleForm: this.roleForm }) + const json = JSON.stringify(this.form); + // const json = JSON.stringify({ form: this.form, roleForm: this.roleForm }) this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId : this.userId, @@ -2018,7 +2019,9 @@ export default { }).then(res => { if (res) { let processForm = JSON.parse(res.mesg) + let roleForm = processForm.roleForm ? processForm.roleForm : {} processForm = processForm.form ? processForm.form : processForm + processForm = Object.assign(processForm,roleForm) const dateArr = [] if(processForm.commentCycleStart && processForm.commentCycleEnd){ dateArr[0] = processForm.commentCycleStart diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step4.vue b/src/pages/processCenter/pages/phone/qbrk-product/step4.vue index 1264740a1..89d81a2f3 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/step4.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/step4.vue @@ -1918,7 +1918,8 @@ export default { this.saveLoading = true this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion - const json = JSON.stringify({ form: this.form, roleForm: this.roleForm }) + const json = JSON.stringify(this.form); + // const json = JSON.stringify({ form: this.form, roleForm: this.roleForm }) this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId : this.userId, @@ -2016,7 +2017,9 @@ export default { }).then(res => { if (res) { let processForm = JSON.parse(res.mesg) + let roleForm = processForm.roleForm ? processForm.roleForm : {} processForm = processForm.form ? processForm.form : processForm + processForm = Object.assign(processForm,roleForm) const dateArr = [] if(processForm.commentCycleStart && processForm.commentCycleEnd){ dateArr[0] = processForm.commentCycleStart diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step7.vue b/src/pages/processCenter/pages/phone/qbrk-product/step7.vue index 9134431a0..cfad7fc1e 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/step7.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/step7.vue @@ -2014,7 +2014,8 @@ export default { this.saveLoading = true this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion - const json = JSON.stringify({ form: this.form, roleForm: this.roleForm }) + const json = JSON.stringify(this.form); + // const json = JSON.stringify({ form: this.form, roleForm: this.roleForm }) this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId : this.userId, @@ -2130,7 +2131,9 @@ export default { }).then(res => { if (res) { let processForm = JSON.parse(res.mesg) + let roleForm = processForm.roleForm ? processForm.roleForm : {} processForm = processForm.form ? processForm.form : processForm + processForm = Object.assign(processForm,roleForm) const dateArr = [] if(processForm.commentCycleStart && processForm.commentCycleEnd){ dateArr[0] = processForm.commentCycleStart diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step8.vue b/src/pages/processCenter/pages/phone/qbrk-product/step8.vue index 0eea2f8b9..bf762add7 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/step8.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/step8.vue @@ -1920,7 +1920,8 @@ export default { this.saveLoading = true this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion - const json = JSON.stringify({ form: this.form, roleForm: this.roleForm }) + const json = JSON.stringify(this.form); + // const json = JSON.stringify({ form: this.form, roleForm: this.roleForm }) this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId : this.userId, @@ -2017,7 +2018,9 @@ export default { }).then(res => { if (res) { let processForm = JSON.parse(res.mesg) + let roleForm = processForm.roleForm ? processForm.roleForm : {} processForm = processForm.form ? processForm.form : processForm + processForm = Object.assign(processForm,roleForm) const dateArr = [] if(processForm.commentCycleStart && processForm.commentCycleEnd){ dateArr[0] = processForm.commentCycleStart