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

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue

@@ -130,6 +130,7 @@
             <el-select
               v-model="sarAccessInfo.typeApplicable"
               placeholder="请选择"
+              clearable
               filterable
               size="small"
             >
@@ -145,6 +146,7 @@
             <el-select
               v-model="sarAccessInfo.syrz"
               placeholder="请选择"
+              clearable
               filterable
               size="small"
             >
@@ -936,7 +938,7 @@ export default {
       // 责任部门数据字典
       this.zrbmOptions = res.data.ZRBMCLASS
       // 能源类型数据字典
-      this.CycxOptions = res.data.CLLX
+      this.CycxOptions = res.data.ENERGYTYPES
       // this.categoryOptions = res.data.NYLXCLASS // 能源类型
       // 适用车型数据字典
       this.applyArcticOptions = res.data.PRODUCTTYPE
@@ -1058,8 +1060,10 @@ export default {
       this.sarAccessInfoSearch.advanceSearchVOStr = ''
       // 国内标准法规可查字段
       if (val === 'INLAND_STAND'){
+        this.selectLawsStands()
         // 海外标准法规可查字段
       }else if (val === 'FOREIGN_STAND'){
+        this.selectLawsStands()
         // 国内外政策可查字段
       }
     },
@@ -1419,10 +1423,10 @@ export default {
     // 高级查询-查询按钮
     selectBtn() {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
-        this.sarAccessInfoSearch.standType = 'INLAND'
+        this.sarAccessInfo.standType = 'INLAND'
         this.selectPage()
       } else {
-        this.sarAccessInfoSearch.standType = 'FOREIGN'
+        this.sarAccessInfo.standType = 'FOREIGN'
         this.selectPage()
       }
     },
@@ -1863,29 +1867,7 @@ export default {
           }
         })
         this.sarAccessInfoSearchList.forEach(item => {
-          if (item.attrInfoMap === null) {
-            this.$set(item, 'zccssrqgj', '')
-            this.$set(item, 'xcxssrqgj', '')
-            this.$set(item, 'sycpx', '')
-            this.$set(item, 'typeApplicable', '')
-            this.$set(item, 'nylx', '')
-            this.$set(item, 'zrbm', '')
-            this.$set(item, 'cycvppsbm', '')
-            this.$set(item, 'cycvppscn', '')
-            this.$set(item, 'kccvppsbm', '')
-            this.$set(item, 'kccvppscn', '')
-          }else {
-            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
-            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
-            this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
-            this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
-            this.$set(item, 'nylx', item.attrInfoMap.NYLX)
-            this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
-            this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
-            this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
-            this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
-            this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
-          }
+          this.addWord(item)
         })
       }, e => {
 
@@ -1932,7 +1914,7 @@ export default {
       this.regionOptions = res.data.REGION // 基础信息 区域list
       this.applyArcticOptions = res.data.PRODUCTTYPE || [] // 基础车型 适用车型list
       this.energyKindOptions = res.data.ENERGYTYPES || [] // 能源种类list
-      this.CycxOptions = res.data.CLLX || [] // 能源种类list
+      this.CycxOptions = res.data.ENERGYTYPES // 能源种类list
       this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list
       this.applyOptions = res.data.COUNTRY  //适用区域list
       this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质