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

---
 .../pages/addEdit.vue                           | 16 ++++++++++++----
 .../pages/otherAddEit.vue                       | 17 +++++++++++++----
 .../pages/projectAddEit.vue                     | 17 +++++++++++++----
 3 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index b1bbd0aed..1a786bd70 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -304,11 +304,14 @@
           label="能源类型">
         </el-table-column>
         <el-table-column
-          prop="putTime"
+          prop="ssrq"
           sortable
           align="center"
           width="210px"
           label="标准实施日期">
+          <template slot-scope="scope">
+            <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }}</span>
+          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
@@ -458,7 +461,7 @@
           </el-form-item>
           <el-form-item label="标准实施日期" prop="putTime">
             <el-date-picker
-              v-model.trim="editRowData.putTime"
+              v-model.trim="editRowData.ssrq"
               type="date"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
@@ -582,7 +585,7 @@ export default {
         standEnName: '',
         typeApplicable: '',
         nylx: '',
-        putTime: '',
+        ssrq: '',
         zccssrqgj: '',
         xcxssrqgj: '',
         zrbm: '',
@@ -1335,6 +1338,7 @@ export default {
             this.$set(item, 'zccssrqgj', '')
             this.$set(item, 'xcxssrqgj', '')
             this.$set(item, 'sycpx', '')
+            this.$set(item, 'ssrq', '')
             this.$set(item, 'typeApplicable', '')
             this.$set(item, 'nylx', '')
             this.$set(item, 'zrbm', '')
@@ -1346,6 +1350,7 @@ export default {
             this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
             this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+            this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)
             this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
@@ -1382,6 +1387,7 @@ export default {
           if (item.attrInfoMap === null) {
             this.$set(item, 'zccssrqgj', '')
             this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'ssrq', '')
             this.$set(item, 'sycpx', '')
             this.$set(item, 'typeApplicable', '')
             this.$set(item, 'nylx', '')
@@ -1393,6 +1399,7 @@ export default {
           }else {
             this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
             this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+            this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1427,6 +1434,7 @@ export default {
         if (item.attrInfoMap === null) {
           this.$set(item, 'zccssrqgj', '')
           this.$set(item, 'xcxssrqgj', '')
+          this.$set(item, 'ssrq', '')
           this.$set(item, 'sycpx', '')
           this.$set(item, 'typeApplicable', '')
           this.$set(item, 'nylx', '')
@@ -1438,6 +1446,7 @@ export default {
         }else {
           this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
           this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+          this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
           this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
           this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
           this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1526,7 +1535,6 @@ export default {
     },
     // 导出确定功能
     exportTestItem () {
-      let exportNames = this.exportName
       let exportList = []
       if (this.sarAccessInfoListArry.length > 0) {
         exportList = this.sarAccessInfoListArry
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 5a1df3685..0dfdedf9f 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -288,11 +288,14 @@
           label="能源类型">
         </el-table-column>
         <el-table-column
-          prop="putTime"
+          prop="ssrq"
           sortable
           align="center"
           width="210px"
           label="标准实施日期">
+          <template slot-scope="scope">
+            <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }}</span>
+          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
@@ -440,9 +443,9 @@
         <el-form-item label="能源类型" prop="nylx">
           <el-input v-model.trim="editRowData.nylx" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="标准实施日期" prop="putTime">
+        <el-form-item label="标准实施日期" prop="ssrq">
           <el-date-picker
-            v-model.trim="editRowData.putTime"
+            v-model.trim="editRowData.ssrq"
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择日期">
@@ -566,7 +569,7 @@ export default {
         standEnName: '',
         typeApplicable: '',
         nylx: '',
-        putTime: '',
+        ssrq: '',
         zccssrqgj: '',
         xcxssrqgj: '',
         zrbm: '',
@@ -1302,6 +1305,7 @@ export default {
           if (item.attrInfoMap === null) {
             this.$set(item, 'zccssrqgj', '')
             this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'ssrq', '')
             this.$set(item, 'sycpx', '')
             this.$set(item, 'typeApplicable', '')
             this.$set(item, 'nylx', '')
@@ -1313,6 +1317,7 @@ export default {
           }else {
             this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
             this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+            this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1349,6 +1354,7 @@ export default {
           if (item.attrInfoMap === null) {
             this.$set(item, 'zccssrqgj', '')
             this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'ssrq', '')
             this.$set(item, 'sycpx', '')
             this.$set(item, 'typeApplicable', '')
             this.$set(item, 'nylx', '')
@@ -1360,6 +1366,7 @@ export default {
           }else {
             this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
             this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+            this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1395,6 +1402,7 @@ export default {
         if (item.attrInfoMap === null) {
           this.$set(item, 'zccssrqgj', '')
           this.$set(item, 'xcxssrqgj', '')
+          this.$set(item, 'ssrq', '')
           this.$set(item, 'sycpx', '')
           this.$set(item, 'typeApplicable', '')
           this.$set(item, 'nylx', '')
@@ -1406,6 +1414,7 @@ export default {
         }else {
           this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
           this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+          this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
           this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
           this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
           this.$set(item, 'nylx', item.attrInfoMap.NYLX)
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index f75c5adfc..2e73c4f2c 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -288,11 +288,14 @@
           label="能源类型">
         </el-table-column>
         <el-table-column
-          prop="putTime"
+          prop="ssrq"
           sortable
           align="center"
           width="210px"
           label="标准实施日期">
+          <template slot-scope="scope">
+            <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }}</span>
+          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
@@ -439,9 +442,9 @@
         <el-form-item label="能源类型" prop="nylx">
           <el-input v-model.trim="editRowData.nylx" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="标准实施日期" prop="putTime">
+        <el-form-item label="标准实施日期" prop="ssrq">
           <el-date-picker
-            v-model.trim="editRowData.putTime"
+            v-model.trim="editRowData.ssrq"
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择日期">
@@ -580,7 +583,7 @@ export default {
         standEnName: '',
         typeApplicable: '',
         nylx: '',
-        putTime: '',
+        ssrq: '',
         zccssrqgj: '',
         xcxssrqgj: '',
         zrbm: '',
@@ -1302,6 +1305,7 @@ export default {
           if (item.attrInfoMap === null) {
             this.$set(item, 'zccssrqgj', '')
             this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'ssrq', '')
             this.$set(item, 'sycpx', '')
             this.$set(item, 'typeApplicable', '')
             this.$set(item, 'nylx', '')
@@ -1313,6 +1317,7 @@ export default {
           }else {
             this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
             this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+            this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1349,6 +1354,7 @@ export default {
           if (item.attrInfoMap === null) {
             this.$set(item, 'zccssrqgj', '')
             this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'ssrq', '')
             this.$set(item, 'sycpx', '')
             this.$set(item, 'typeApplicable', '')
             this.$set(item, 'nylx', '')
@@ -1360,6 +1366,7 @@ export default {
           }else {
             this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
             this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+            this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1394,6 +1401,7 @@ export default {
         if (item.attrInfoMap === null) {
           this.$set(item, 'zccssrqgj', '')
           this.$set(item, 'xcxssrqgj', '')
+          this.$set(item, 'ssrq', '')
           this.$set(item, 'sycpx', '')
           this.$set(item, 'typeApplicable', '')
           this.$set(item, 'nylx', '')
@@ -1405,6 +1413,7 @@ export default {
         }else {
           this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
           this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+          this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
           this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
           this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
           this.$set(item, 'nylx', item.attrInfoMap.NYLX)