From 5a00318cd245471eb2bb5082a960d0c367c4eb4a Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Thu, 9 Dec 2021 09:30:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=BA=93=E5=9B=9B?= =?UTF-8?q?=E4=B8=AA=E6=97=A5=E6=9C=9F=E5=A4=9A=E9=80=89=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 35cb33d8c..52208b187 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -243,8 +243,8 @@ {{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }} - {{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }} + style="color: #F56C6C">{{ scope.row.SSRQ }} + {{ scope.row.SSRQ }} @@ -270,8 +270,8 @@ {{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ : '-' }} - {{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ : '-' }} + style="color: #F56C6C">{{ scope.row.ZCCSSRQ }} + {{ scope.row.ZCCSSRQ }} Date: Wed, 8 Dec 2021 17:59:01 +0800 Subject: [PATCH 2/4] commit --- src/pages/details/complianceDetails/index.vue | 4 ++-- .../processCenter/pages/creatProcess/xmpg/step1-1.vue | 6 ------ .../processCenter/pages/creatProcess/xmpg/step1.vue | 6 ------ .../processCenter/pages/creatProcess/xmpg2/step1-1.vue | 9 --------- .../processCenter/pages/creatProcess/xmpg2/step1.vue | 9 --------- .../processCenter/pages/creatProcess/xmqdqr/step2.vue | 9 --------- 6 files changed, 2 insertions(+), 41 deletions(-) diff --git a/src/pages/details/complianceDetails/index.vue b/src/pages/details/complianceDetails/index.vue index 5ae648fb6..7fe30ebb5 100644 --- a/src/pages/details/complianceDetails/index.vue +++ b/src/pages/details/complianceDetails/index.vue @@ -32,12 +32,12 @@ > - - - - - - - - - - - - - Date: Thu, 9 Dec 2021 10:38:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/phone/jrbzhxh/step3.vue | 657 ++++++++++++++++ .../pages/phone/jrbzhxh/step4.vue | 657 ++++++++++++++++ .../processCenter/pages/phone/wbsm/step3.vue | 13 + .../pages/phone/xmqdqr/step5.vue | 715 ++++++++++++++++++ src/router/index.js | 30 + 5 files changed, 2072 insertions(+) create mode 100644 src/pages/processCenter/pages/phone/jrbzhxh/step3.vue create mode 100644 src/pages/processCenter/pages/phone/jrbzhxh/step4.vue create mode 100644 src/pages/processCenter/pages/phone/wbsm/step3.vue create mode 100644 src/pages/processCenter/pages/phone/xmqdqr/step5.vue diff --git a/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue b/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue new file mode 100644 index 000000000..7f473aeef --- /dev/null +++ b/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue @@ -0,0 +1,657 @@ + + + + + + diff --git a/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue b/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue new file mode 100644 index 000000000..86697848d --- /dev/null +++ b/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue @@ -0,0 +1,657 @@ + + + + + + diff --git a/src/pages/processCenter/pages/phone/wbsm/step3.vue b/src/pages/processCenter/pages/phone/wbsm/step3.vue new file mode 100644 index 000000000..feb758afb --- /dev/null +++ b/src/pages/processCenter/pages/phone/wbsm/step3.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/xmqdqr/step5.vue b/src/pages/processCenter/pages/phone/xmqdqr/step5.vue new file mode 100644 index 000000000..f78968e5e --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmqdqr/step5.vue @@ -0,0 +1,715 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index e5ac293ed..86627116f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2054,6 +2054,36 @@ const routes = [ title: '项目合规评估流程' } }, + { + path: '/phoneXmqdqrStep5', + name: 'phoneXmqdqrStep5', + component: () => import('@/pages/processCenter/pages/phone/xmqdqr/step5.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '项目清单确认流程' + } + }, + { + path: '/phoneGrbzhxhStep3', + name: 'phoneGrbzhxhStep3', + component: () => import('@/pages/processCenter/pages/phone/jrbzhxh/step3.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '加入标准化协会信息提报流程' + } + }, + { + path: '/phoneGrbzhxhStep4', + name: 'phoneGrbzhxhStep4', + component: () => import('@/pages/processCenter/pages/phone/jrbzhxh/step4.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '加入标准化协会信息提报流程' + } + }, { path: '/phoneWfhxStep5', name: 'phoneWfhxStep5', From a86b1c170be8e3ea81dc513645c193c604f77e27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 9 Dec 2021 11:16:44 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmqdqr/step1-3.vue | 9 -- .../pages/creatProcess/xmqdqr/step2.vue | 38 +++--- .../pages/creatProcess/xmqdqr/step3.vue | 116 ++++++++---------- .../pages/creatProcess/xmqdqr/step4.vue | 45 +++---- .../pages/creatProcess/xmqdqr/step5.vue | 9 -- 5 files changed, 87 insertions(+), 130 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-3.vue index 08e1752ee..988f3e6f5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-3.vue @@ -102,18 +102,12 @@ align="center" sortable label="标准实施日期"> - - - +
{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }} - {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }} + {{ scope.row.ssrq }} @@ -359,7 +360,7 @@ label="新车型实施日期"> {{ - scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' + scope.row.ssrq }} {{ - scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' + scope.row.ssrq }} - {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }} + {{ scope.row.ssrq }} @@ -465,13 +466,13 @@ label="新车型实施日期"> @@ -481,13 +482,13 @@ label="在产车实施日期"> @@ -554,9 +555,9 @@ width="120" >
+ - - - - - - - - - - - {{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }} - {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }} + {{ scope.row.ssrq }} @@ -389,7 +372,7 @@ label="新车型实施日期"> {{ - scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' + scope.row.ssrq }} {{ - scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' + scope.row.ssrq }} - {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }} + {{ scope.row.ssrq }} @@ -495,13 +478,13 @@ label="新车型实施日期"> @@ -511,13 +494,13 @@ label="在产车实施日期"> @@ -584,9 +567,9 @@ width="120" > { - if(item.ssrq === "-"){ - item.ssrq = '' - } - if(item.zrbm === '[]'){ - item.zrbm ='' - } - }) - this.standList.map(item => { - let addIndex - addIndex = this.dataList.findIndex(items =>{ - return items.id === item.id - }) - if(addIndex > -1){ - this.$message.warning('请勿重复添加数据') - }else{ - this.dataList.push(item) - } - }) - - this.standModel = false - } - - }, + // okStand() { + // if(this.standList.length < 1){ + // this.$message.warning('请至少选择一条数据进行添加') + // }else{ + // this.standList.forEach(item =>{ + // if(item.ssrq === "-"){ + // item.ssrq = '' + // } + // if(item.zrbm === '[]'){ + // item.zrbm ='' + // } + // }) + // this.standList.map(item => { + // let addIndex + // addIndex = this.dataList.findIndex(items =>{ + // return items.id === item.id + // }) + // if(addIndex > -1){ + // this.$message.warning('请勿重复添加数据') + // }else{ + // this.dataList.push(item) + // } + // }) + // + // this.standModel = false + // } + // + // }, //手动查找的清空按钮 clearLawBtn(){ this.lawInfoTableLoading = true @@ -1162,6 +1145,7 @@ export default { this.$message.warning('请先选择标准/政策来源') } }, + //添加标准带入事件 handleSelectConfirm(){ if(this.handleSelectTableList.length < 1){ this.$message.warning('请至少选择一条数据进行添加') @@ -1175,6 +1159,8 @@ export default { } }) this.handleSelectTableList.map(item => { + this.$set(item, 'involve', 'involve') + this.$set(item, 'remarks', '') let addIndex addIndex = this.dataList.findIndex(items =>{ return items.id === item.id @@ -1185,10 +1171,6 @@ export default { this.dataList.push(item) } }) - this.dataList.forEach(item => { - this.$set(item, 'involve', 'involve') - this.$set(item, 'remarks', '') - }) this.standModel = false } }, diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue index 2a2e58460..4fa29cf5e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue @@ -107,27 +107,18 @@ width="190px" align="center" label="标准实施日期"> - - - {{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }} - {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }} + {{ scope.row.ssrq }} @@ -373,7 +364,7 @@ label="新车型实施日期"> {{ - scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' + scope.row.ssrq }} {{ - scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' + scope.row.ssrq }} - {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }} + {{ scope.row.ssrq }} @@ -479,13 +470,13 @@ label="新车型实施日期"> @@ -495,13 +486,13 @@ label="在产车实施日期"> @@ -568,9 +559,9 @@ width="120" > - - -