Merge remote-tracking branch 'origin/develop' into develop

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"
         },
         {

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
       // 适用产品线数据字典

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()