From 6f0f26497a1a07f2177f9ee6337b3097d955d6b9 Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Mon, 26 Jul 2021 15:40:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=88=97=E8=A1=A8=E6=B8=85=E7=A9=BA=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=EF=BC=8C=E6=9F=A5=E8=AF=A2=EF=BC=8C=E7=BC=96=E8=BE=91=E9=A1=B5?=
 =?UTF-8?q?=E7=9A=84=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/listOfCountries.vue                  |  6 ------
 .../pages/addEdit.vue                         | 19 ++++++++++++++++++
 .../pages/details.vue                         |  4 ++--
 .../pages/otherAddEit.vue                     | 20 +++++++++++++++++++
 .../pages/projectAddEit.vue                   | 20 +++++++++++++++++++
 5 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index cc10b90c5..60757cd0d 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -86,12 +86,6 @@
           prop="countryArea"
           label="国家/地区"
           align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.countryArea !== null && scope.row.countryArea.indexOf(',')  > 0">
-              <span>{{ scope.row.countryArea }}</span>
-            </span>
-            <span v-else>{{ countryAreaMap[scope.row.countryArea] }}</span>
-          </template>
         </el-table-column>
         <el-table-column
           prop="detailedListName"
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 77f06915a..4fcd9526c 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -1477,6 +1477,18 @@ export default {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
         })
+        this.sarAccessInfoSearchList.forEach(item => {
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          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.drawerTotal = res.data.list.length
       }, e => {
       })
@@ -2004,6 +2016,13 @@ export default {
         _this: this
       }, res => {
         this.sarAccessInfoList = res.data
+        this.sarAccessInfoList.forEach(item => {
+          if (item.standYear === null) {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber
+          } else {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+          }
+        })
       }, e => {
       })
     },
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index 32b738445..2e6ab6b5b 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -151,7 +151,7 @@
                 size="small"
               >
                 <el-option
-                  v-for="item in energyKindOptions"
+                  v-for="item in categoryOptions"
                   :value="item.value"
                   :key="item.value"
                   :label="item.label"
@@ -409,7 +409,7 @@ export default {
       // 适用车型
       applyArcticOptions: [],
       // 能源类型
-      energyKindOptions: [],
+      categoryOptions: [],
       // 责任部门
       zrbmOptions: [],
       // 适用产品线
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 0677f2e9d..cc3b1fc61 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -944,6 +944,7 @@ export default {
     },
     // 点击清空查询条件 按钮事件
     clearSearchLaws () {
+      this.sarAccessInfoSearch.standName = ''
       this.sarAccessInfoSearch.advanceSearchVOStr = ''
       this.sarAccessInfoSearch.applyArctic = '' // 能源种类
       this.sarAccessInfoSearch.keywords = '' // 关键字
@@ -1288,6 +1289,18 @@ export default {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
         })
+        this.sarAccessInfoSearchList.forEach(item => {
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          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.drawerTotal = res.data.list.length
       }, e => {
 
@@ -1818,6 +1831,13 @@ export default {
         _this: this
       }, res => {
         this.sarAccessInfoList = res.data
+        this.sarAccessInfoList.forEach(item => {
+          if (item.standYear === null) {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber
+          } else {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+          }
+        })
       }, e => {
 
       })
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index d636411a5..07272fbed 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -942,6 +942,7 @@ export default {
     },
     // 点击清空查询条件 按钮事件
     clearSearchLaws () {
+      this.sarAccessInfoSearch.standName = ''
       this.sarAccessInfoSearch.advanceSearchVOStr = ''
       this.sarAccessInfoSearch.applyArctic = '' // 能源种类
       this.sarAccessInfoSearch.keywords = '' // 关键字
@@ -1818,6 +1819,25 @@ export default {
         _this: this
       }, res => {
         this.sarAccessInfoList = res.data
+        this.sarAccessInfoList.forEach(item => {
+          if (item.standYear === null) {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber
+          } else {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+          }
+        })
+        this.sarAccessInfoSearchList.forEach(item => {
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          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)
+        })
       }, e => {
 
       })