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 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=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; } }); From c70e400c7e5113fdee191d11a6bffb091f84a1a0 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 21 Feb 2022 10:00:15 +0800 Subject: [PATCH 2/2] commit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzrk/step3.vue | 2 +- src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 376fb2101..b13b07f8b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -2072,7 +2072,7 @@ export default { this.defaultCheckedKeys3 = [this.form.dybxh] this.treeCheckedKeys = this.form.treeListId.split(',') this.form.standType = this.form.standInData === "0" ? 'INLAND' : 'FOREIGN' - this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : '' + this.form.standYear = this.form.standYear ? this.form.standYear : '' if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') { this.form.country = this.form.country.split(","); } @@ -2211,7 +2211,7 @@ export default { this.key2++ this.key3++ this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' - this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : '' + this.form.standYear = bringData.standYear ? bringData.standYear : '' this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form['id'] = bringData.id diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index d7d84b0f6..42b2a59d7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -1091,7 +1091,7 @@ export default { this.defaultCheckedKeys2 = [this.form.kccvppsbm] this.defaultCheckedKeys3 = [this.form.dybxh] this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' - this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : '' + this.form.standYear = this.form.standYear ? this.form.standYear : '' this.form.prcNum = this.prcNum this.form.prcName = this.prcName if( this.form.country !== undefined && this.form.country !== null && this.form.country !== ''){ diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index caca4b13c..a94daa191 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -2540,11 +2540,14 @@ export default { }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) + console.log(processForm); + console.log(this.form); // this.commentText = processForm.commentText if (processForm.form === undefined) { this.getFormFieldList(processForm) } else { //表单文件处理 + console.log(2); this.getFormFieldList(processForm.form) } } @@ -2565,7 +2568,7 @@ export default { this.defaultCheckedKeys3 = [this.form.dybxh]; this.treeCheckedKeys = this.form.treeListId.split(',') this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' - this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : '' + this.form.standYear = this.form.standYear ? this.form.standYear : '' this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form['id'] = item.id