From a971560eba8b9b0b6043973feaae93a51fa40e94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 12 Apr 2022 14:52:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E6=B5=81=E7=A8=8Bbug=20=20=E6=89=8B=E6=9C=BA=E7=AB=AF?= =?UTF-8?q?=E5=AD=97=E4=BD=93=E9=A2=9C=E8=89=B2=E5=A4=AA=E6=B5=85=20?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=9D=A1=E6=AC=BE=E5=86=85=E5=AE=B9=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=97=A0=E6=B3=95=E7=82=B9=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzpg/step4.vue | 4 + .../pages/creatProcess/bzpg/step5.vue | 7 +- .../pages/creatProcess/bzpg/step6.vue | 7 +- .../pages/creatProcess/bzpg/step7.vue | 7 +- .../pages/creatProcess/bzpg/step8-1.vue | 6 + .../pages/creatProcess/bzpg/step8.vue | 7 +- .../processCenter/pages/phone/bzpg/step2.vue | 56 ++------ .../processCenter/pages/phone/bzpg/step6.vue | 130 ++++++----------- .../processCenter/pages/phone/bzpg/step7.vue | 131 ++++++------------ .../processCenter/pages/phone/bzpg/step8.vue | 130 ++++++----------- 10 files changed, 162 insertions(+), 323 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue index 494056ebd..0d91bc05a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue @@ -317,6 +317,7 @@ export default { data(){ return { active: '1', + changePoint: false, projectName: '', activeName: '', fileType: '', //条款文件类型 @@ -383,6 +384,9 @@ export default { if(!this.projectTabName.includes(item.projectName)){ this.projectTabName.push(item.projectName) } + if(item.changePoint){ + this.changePoint = true + } }) this.projectName = this.activeName = this.projectTabName[Object.keys(this.projectTabName)[0]] this.listForm.resDats = [] diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue index cb1835263..ae7929cb7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue @@ -553,6 +553,7 @@ export default { return { //折叠的标志,true为折叠,false为不折叠 foldFormFlag: false, + changePoint: false, comFlag: 0, nodeList:[], drawerTitle:'', @@ -769,7 +770,11 @@ export default { this.listForm = item.form; this.dataList = item.form.dataList; } - + this.dataList.forEach(item => { + if(item.changePoint){ + this.changePoint = true + } + }) }); }, diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue index 21a4ba3fa..4a6e5a51e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue @@ -391,6 +391,7 @@ export default { return { //折叠的标志,true为折叠,false为不折叠 foldFormFlag: false, + changePoint: false, comFlag: 0, nodeList:[], drawerTitle:'', @@ -591,7 +592,11 @@ export default { this.listForm = item.form; this.dataList = item.form.dataList; } - + this.dataList.forEach(item => { + if(item.changePoint){ + this.changePoint = true + } + }) }); }, diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue index 9c6958979..f483c527e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue @@ -399,6 +399,7 @@ export default { //折叠的标志,true为折叠,false为不折叠 activeName: '', foldFormFlag: false, + changePoint: false, projectTabName: [], comFlag: 0, nodeList:[], @@ -610,7 +611,11 @@ export default { this.listForm = item.form; this.dataList = item.form.dataList; } - + this.dataList.forEach(item => { + if(item.changePoint){ + this.changePoint = true + } + }) }); }, diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue index 3bcbecd94..4d0be0df1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue @@ -399,6 +399,7 @@ export default { //折叠的标志,true为折叠,false为不折叠 activeName: '', foldFormFlag: false, + changePoint: false, projectTabName: [], comFlag: 0, nodeList:[], @@ -610,6 +611,11 @@ export default { this.listForm = item.form; this.dataList = item.form.dataList; } + this.dataList.forEach(item => { + if(item.changePoint){ + this.changePoint = true + } + }) }); }, diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue index 2a2589286..2c86bffda 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue @@ -399,6 +399,7 @@ export default { //折叠的标志,true为折叠,false为不折叠 activeName: '', foldFormFlag: false, + changePoint: false, projectTabName: [], comFlag: 0, nodeList:[], @@ -610,7 +611,11 @@ export default { this.listForm = item.form; this.dataList = item.form.dataList; } - + this.dataList.forEach(item => { + if(item.changePoint){ + this.changePoint = true + } + }) }); }, diff --git a/src/pages/processCenter/pages/phone/bzpg/step2.vue b/src/pages/processCenter/pages/phone/bzpg/step2.vue index 6fb747d9d..085e2f072 100644 --- a/src/pages/processCenter/pages/phone/bzpg/step2.vue +++ b/src/pages/processCenter/pages/phone/bzpg/step2.vue @@ -18,52 +18,10 @@ > - - - - - - - - - - - - - - - - - - + + + + @@ -224,6 +182,12 @@ export default { this.dataList = item.dataList this.dataList.distributePerson = item.dataList[0].distributePerson this.listForm.breakdownList = item.breakdownList + if(!this.listForm.qualityEngineerName){ + this.listForm.qualityEngineerName = '--' + } + if(!this.listForm.certifiedEngineerName){ + this.listForm.certifiedEngineerName = '--' + } }) }, //tab发生变化 diff --git a/src/pages/processCenter/pages/phone/bzpg/step6.vue b/src/pages/processCenter/pages/phone/bzpg/step6.vue index 3d143ff0c..47aad5c0b 100644 --- a/src/pages/processCenter/pages/phone/bzpg/step6.vue +++ b/src/pages/processCenter/pages/phone/bzpg/step6.vue @@ -22,52 +22,10 @@
- - - - - - - - - - - - - - - - - - + + + +
@@ -77,50 +35,10 @@ @@ -281,6 +199,9 @@ @submit="handleSubmit" > + +
+
{ + this.itermsConditionsTitle = res.data[0].termsConditions.replace(/''/g, '\'') + }) + this.itermsConditionsFlag = true + }, // 点击查看 handlePreview(item) { let routeUrl = this.$router.resolve({ @@ -518,7 +456,17 @@ export default { this.listForm = item.form; this.dataList = item.form.dataList; } - + if(!this.listForm.qualityEngineerName){ + this.listForm.qualityEngineerName = '--' + } + if(!this.listForm.certifiedEngineerName){ + this.listForm.certifiedEngineerName = '--' + } + this.dataList.forEach(item => { + if(item.changePoint){ + this.changePoint = true + } + }) }); }, //驳回事件 diff --git a/src/pages/processCenter/pages/phone/bzpg/step7.vue b/src/pages/processCenter/pages/phone/bzpg/step7.vue index a3d7a995a..5c2ef9351 100644 --- a/src/pages/processCenter/pages/phone/bzpg/step7.vue +++ b/src/pages/processCenter/pages/phone/bzpg/step7.vue @@ -22,52 +22,10 @@
- - - - - - - - - - - - - - - - - - + + + +
@@ -77,50 +35,10 @@ @@ -288,6 +206,9 @@ @submit="handleSubmit" > + +
+
{ + this.itermsConditionsTitle = res.data[0].termsConditions.replace(/''/g, '\'') + }) + this.itermsConditionsFlag = true + }, // 点击查看 handlePreview(item) { let routeUrl = this.$router.resolve({ @@ -535,7 +474,17 @@ export default { this.listForm = item.form; this.dataList = item.form.dataList; } - + if(!this.listForm.qualityEngineerName){ + this.listForm.qualityEngineerName = '--' + } + if(!this.listForm.certifiedEngineerName){ + this.listForm.certifiedEngineerName = '--' + } + this.dataList.forEach(item => { + if(item.changePoint){ + this.changePoint = true + } + }) }); }, //提交事件 diff --git a/src/pages/processCenter/pages/phone/bzpg/step8.vue b/src/pages/processCenter/pages/phone/bzpg/step8.vue index f6daa561c..5acbecf66 100644 --- a/src/pages/processCenter/pages/phone/bzpg/step8.vue +++ b/src/pages/processCenter/pages/phone/bzpg/step8.vue @@ -22,52 +22,10 @@
- - - - - - - - - - - - - - - - - - + + + +
@@ -77,50 +35,10 @@ @@ -288,6 +206,9 @@ @submit="handleSubmit" > + +
+
{ + this.itermsConditionsTitle = res.data[0].termsConditions.replace(/''/g, '\'') + }) + this.itermsConditionsFlag = true + }, // 点击查看 handlePreview(item) { let routeUrl = this.$router.resolve({ @@ -535,7 +473,17 @@ export default { this.listForm = item.form; this.dataList = item.form.dataList; } - + if(!this.listForm.qualityEngineerName){ + this.listForm.qualityEngineerName = '--' + } + if(!this.listForm.certifiedEngineerName){ + this.listForm.certifiedEngineerName = '--' + } + this.dataList.forEach(item => { + if(item.changePoint){ + this.changePoint = true + } + }) }); }, //提交事件