From b1c616ff5ab5c4d99a0d8038902e8bcce13cde22 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 11 Jan 2022 16:56:22 +0800 Subject: [PATCH] commit --- .../processCenter/pages/creatProcess/bzzqyj/step6.vue | 8 +++++--- .../processCenter/pages/creatProcess/bzzqyj/step7.vue | 7 ++++--- .../processCenter/pages/creatProcess/bzzqyj/step8.vue | 7 ++++--- .../processCenter/pages/creatProcess/bzzqyj/step9.vue | 7 ++++--- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index 5ea813a7b..db4ee6551 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -526,6 +526,7 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg); + console.log(data); this.commentText6 = data.commentText6 || '' this.form.fjList = data.fjList || data.form.fjList this.form.cid = data.cid || data.form.cid; @@ -534,9 +535,10 @@ this.form.modelList = data.modelList || data.form.modelList this.form.user7 = data.form ? data.form.user7 : (data.user7 ? data.user7 : '') this.form.user7Name = data.form ? data.form.user7Name : (data.user7Name ? data.user7Name : '') - this.oldData = JSON.parse(JSON.stringify(data.info)) - var arr = [] - data.info.forEach(item => { + let newArr = data.info ? data.info : data.form.data + this.oldData = JSON.parse(JSON.stringify(newArr)) + let arr = [] + newArr.forEach(item => { if (item.state != '3') { arr.push(item) } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index ec06fe45c..544bed354 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -493,9 +493,10 @@ export default { this.form.endTime = data.endTime || data.form.endTime; this.form.textType = data.textType || data.form.textType this.form.modelList = data.modelList || data.form.modelList - this.oldData = JSON.parse(JSON.stringify(data.info)) - var arr = [] - data.info.forEach(item => { + let newArr = data.info ? data.info : data.form.data + this.oldData = JSON.parse(JSON.stringify(newArr)) + let arr = [] + newArr.forEach(item => { if (item.state != '3') { arr.push(item) } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index d6834e855..90dbad5a6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -496,9 +496,10 @@ export default { this.form.endTime = data.endTime || data.form.endTime; this.form.textType = data.textType || data.form.textType this.form.modelList = data.modelList || data.form.modelList - this.oldData = JSON.parse(JSON.stringify(data.info)) - var arr = [] - data.info.forEach(item => { + let newArr = data.info ? data.info : data.form.data + this.oldData = JSON.parse(JSON.stringify(newArr)) + let arr = [] + newArr.forEach(item => { if (item.state != '3') { arr.push(item) } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 8fc381cb8..61c52caf5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -496,9 +496,10 @@ export default { this.form.endTime = data.endTime || data.form.endTime; this.form.textType = data.textType || data.form.textType this.form.modelList = data.modelList || data.form.modelList - this.oldData = JSON.parse(JSON.stringify(data.info)) - var arr = [] - data.info.forEach(item => { + let newArr = data.info ? data.info : data.form.data + this.oldData = JSON.parse(JSON.stringify(newArr)) + let arr = [] + newArr.forEach(item => { if (item.state != '3') { arr.push(item) }