From 4ff70eba62c566813b2e1379cde481da20932422 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, 6 Jan 2022 14:16:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=83=BD=E6=BA=90=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/addEdit.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 3bb275d1e..af8403ca5 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -877,7 +877,7 @@ export default { this.zrbmOptions = res.data.ZRBMCLASS // 能源类型数据字典 this.CycxOptions = res.data.CLLX - // this.categoryOptions = res.data.NYLXCLASS // 能源类型 + this.categoryOptions = res.data.NYLXCLASS // 能源类型 // 适用车型数据字典 this.applyArcticOptions = res.data.PRODUCTTYPE // 适用产品线数据字典 From 6ab7f441e384cceab922e11f9b1353b6bdd1ad32 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, 6 Jan 2022 14:28:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/otherAddEit.vue | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index fda399db8..1f6edd81c 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -1039,6 +1039,32 @@ export default { this.$message.warning('请勿添加重复数据') } else{ this.sarAccessInfoList.push(item) + this.sarAccessInfoList.forEach(item => { + // 能源类型转换 + if (item.nylx !== null) { + let k = (item.nylx || "").split(","); + for (let i in this.applyArcticOptions) { + for (let m = 0; m < k.length; m++) { + if (this.applyArcticOptions[i].value === k[m]) { + k[m] = this.applyArcticOptions[i].label; + } + item.nylx = k.join(","); + } + } + } + // 适用车型转换 + if (item.typeApplicable !== null) { + let k = (item.typeApplicable || "").split(","); + for (let i in this.energyKindOptions) { + for (let m = 0; m < k.length; m++) { + if (this.energyKindOptions[i].value === k[m]) { + k[m] = this.energyKindOptions[i].label; + } + item.typeApplicable = k.join(","); + } + } + } + }) // this.$refs.accessTypeSelect.clearSelection() this.$refs.entryTable.clearSelection() this.$refs.searchTable.clearSelection() From fd9788f267342295e1bd569db00e9417c222c114 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, 6 Jan 2022 14:36:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/components/ProcessMixin.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue index 2f3eace54..b4308c0c2 100644 --- a/src/pages/processCenter/pages/components/ProcessMixin.vue +++ b/src/pages/processCenter/pages/components/ProcessMixin.vue @@ -38,7 +38,7 @@ export default { value: "4" }, { - label: "项目合规评估流程-标准", + label: "标准合规评估流程", value: "5" }, { @@ -57,6 +57,14 @@ export default { label: '项目清单确认流程', value: "10" }, + { + label: "政策课题组参会流程", + value: "18" + }, + { + label: "政策课题组入会流程", + value: "17" + }, { label: "外部署名推荐审批流程", value: "16" @@ -66,7 +74,7 @@ export default { value: "15" }, { - label: "参与外部标准制修订信息提报六合彩能", + label: "参与外部标准制修订信息提报流程", value: "14" }, {