From 5cbd9fb306de87690a3c2e50536c30009f1861f5 Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Thu, 12 Aug 2021 14:16:43 +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=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/addEdit.vue                         |  6 +++---
 .../pages/details.vue                         | 19 +++++++------------
 .../pages/otherAddEit.vue                     |  6 +++---
 .../pages/projectAddEit.vue                   |  6 +++---
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 1a786bd70..0b3225713 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -1248,10 +1248,10 @@ export default {
           let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
-            if (this.sarAccessInfoList[i].putTime === null)  {
-              rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
+            if (this.sarAccessInfoList[i].ssrq === null)  {
+              rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
             }else {
-              rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
+              rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
             }
            if (this.sarAccessInfoList[i].xcxssrqgj === null) {
              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index bb19c111f..6ee8ff256 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -150,11 +150,17 @@
             label="能源类型">
           </el-table-column>
           <el-table-column
-            prop="putTime"
+            prop="ssrq"
             sortable
             align="center"
             width="210px"
             label="标准实施日期">
+            <template slot-scope="scope">
+              <span v-if="scope.row.ssrq === null">
+                {{ scope.row.ssrq }}
+              </span>
+              <span v-else>{{ scope.row.ssrq.slice(0, 10) }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -757,11 +763,6 @@ export default {
     setMap(data){
       data.forEach(item => {
         this.$set(this.textStatusMap, item.value, item.label)
-        this.$set(this.typeApplicableMap, item.value, item.label)
-        this.$set(this.nylxMap, item.value, item.label)
-        this.$set(this.zrbmMap, item.value, item.label)
-        this.$set(this.sycpxMap, item.value, item.label)
-        this.$set(this.countryAreaMap, item.value, item.label)
       })
     }
   },
@@ -797,12 +798,6 @@ export default {
       this.textStatusOptions = res.data.WBZTCLASS
       this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
       this.setMap(this.textStatusOptions)
-      this.setMap(this.zrbmOptions)
-      this.setMap(this.categoryOptions)
-      this.setMap(this.sycpxOptions)
-      this.setMap(this.energyKindOptions)
-      this.setMap(this.drawerCountryOptions)
-      this.setMap(this.applyArcticOptions)
       this.getGzzOption();
     }, e => {
     });
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 0dfdedf9f..ce62849a4 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -1217,10 +1217,10 @@ export default {
           let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
-            if (this.sarAccessInfoList[i].putTime === null)  {
-              rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
+            if (this.sarAccessInfoList[i].ssrq === null)  {
+              rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
             }else {
-              rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
+              rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
             }
             if (this.sarAccessInfoList[i].xcxssrqgj === null) {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 2e73c4f2c..31fa260f8 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -1216,10 +1216,10 @@ export default {
           let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
-            if (this.sarAccessInfoList[i].putTime === null)  {
-              rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
+            if (this.sarAccessInfoList[i].ssrq === null)  {
+              rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
             }else {
-              rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
+              rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
             }
             if (this.sarAccessInfoList[i].xcxssrqgj === null) {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')