From 7a8ceabc73822b910111868f63da01f0bfea9287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 21 Feb 2022 09:50:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 6 +----- .../processCenter/pages/creatProcess/xmpg/step1.vue | 6 +++++- .../processCenter/pages/creatProcess/xmpg/step2.vue | 2 ++ .../processCenter/pages/creatProcess/xmpg/step3.vue | 12 ++++-------- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/main.js b/src/main.js index eff8a3abc..e5eff9089 100644 --- a/src/main.js +++ b/src/main.js @@ -204,11 +204,7 @@ router.beforeEach(function (to, from, next) { } } else if (prcType === '6') { //标准项目合规评估 项目维度 - if (path === "/xmpg2Step1" || path === "/xmpg2Step2" || path === "/xmpg2Step1-2") { - extracted("xmpg2Step1-2"); - } else { - extracted("xmpg2Step1-12"); - } + extracted("xmpgStep1-5"); } else if (prcType === '8') { // 未符合项整改 extracted("wfhxzgStep5-1"); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 66ce7238e..5f47ce3fb 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -666,6 +666,11 @@ export default { _this: this }, res => { this.listForm.breakdownList = res.data; + this.listForm.breakdownList.map(item =>{ + if(item.termsConditions){ + item.termsConditions = '' + } + }) }); }, //标准的多选框改变 @@ -827,7 +832,6 @@ export default { bpnId: this.$route.query.bpnId }).then(res => { let mes = JSON.parse(res.mes); - console.log(mes); if(mes.form.projectNumber){ this.addShow = false } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 97ebc194b..60ea457ae 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -334,6 +334,8 @@ export default { key: item.standId, id: item.id, standId: item.id, + // standType: item.standType, + // zrbm: item.zrbm, itemsNum: item.itemsNum, itemsName: item.itemsName, xcxssrq: item.xcxssrq, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 214dd3bdb..bfef3b75e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -772,11 +772,11 @@ export default { this.dataList = dataListChildren; this.total = this.dataList.length; } else { - this.listForm = item.form; - this.commentText = item.commentText; let dataChildren = []; let dataListChildren = []; - this.dataList = item.dataList; + this.listForm = item.form + this.commentText = item.commentText + this.dataList = item.form.dataList; this.dataList.forEach(item =>{ if(item.children){ item.children.forEach(items =>{ @@ -795,9 +795,6 @@ export default { } }) }) - this.listForm.dataList.forEach(item => { - dataChildren.push(item.children); - }); dataChildren.forEach((item, index) => { dataListChildren = dataListChildren.concat(item); }); @@ -808,9 +805,8 @@ export default { if(index > -1){ dataListChildren.splice(index, 1) } + this.dataList = dataListChildren; this.total = this.dataList.length; - // this.dataList = item.form.dataList[0].children; - // this.total = item.form.dataList[0].children.length; } });