From 59fee2f22428631cd346cb86ac624fd1acf317ec Mon Sep 17 00:00:00 2001
From: yangzijiao <yangzijiao@123.com>
Date: Wed, 21 Jul 2021 13:56:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/addEdit.vue                         |  1 -
 .../pages/otherAddEit.vue                     | 37 ++++++++++++++++---
 .../pages/projectAddEit.vue                   | 34 +++++++++++++++--
 3 files changed, 63 insertions(+), 9 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 9a8810380..8b3390df2 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -459,7 +459,6 @@
             <el-button
               class="common-button-default"
               type="danger"
-              style="margin-left: 0px"
               size="small" @click="moveDown(scope.$index, scope.row)"
               v-if="!disabledFlag"
             >下移</el-button>
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 28e717fee..213a15d12 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -211,17 +211,26 @@
             prop="issueTime"
             sortable
             label="发布日期">
+            <template slot-scope="scope">
+               <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
-            prop="xcxssrq"
+            prop="xcxssrqgj"
             sortable
             label="新车型实施日期">
+              <template slot-scope="scope">
+                  <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+              </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="zccssrq"
+            prop="zccssrqgj"
             sortable
             label="在产车实施日期">
+              <template slot-scope="scope">
+                  <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+              </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -362,6 +371,9 @@
           width="210px"
           align="center"
           label="在产车实施日期">
+            <template slot-scope="scope">
+                <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            </template>
         </el-table-column>
         <el-table-column
           prop="xcxssrqgj"
@@ -369,6 +381,9 @@
           align="center"
           width="210px"
           label="新车型实施日期">
+            <template slot-scope="scope">
+                <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
@@ -418,7 +433,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>
-        <el-table-column>
+        <el-table-column width="150">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"
@@ -539,6 +554,7 @@ export default {
       nylxMap: {},
       zrbmMap: {},
       sycpxMap: {},
+      zrbmOptions: [],
       selectSearch : [],
       // 新增、编辑 基础信息字段
       sarAccessEO: {
@@ -1242,8 +1258,19 @@ export default {
         _this: this
       }, res =>{
         this.sarAccessInfoSearchList = res.data.list
-        this.$nextTick(() => {
-        })
+        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)
+          })
+          console.log(this.sarAccessInfoSearchList)
       }, e => {
 
       })
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index db97c6e44..f388000db 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -211,17 +211,26 @@
             prop="issueTime"
             sortable
             label="发布日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
-            prop="xcxssrq"
+            prop="xcxssrqgj"
             sortable
             label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="zccssrq"
+            prop="zccssrqgj"
             sortable
             label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -362,6 +371,9 @@
           width="210px"
           align="center"
           label="在产车实施日期">
+          <template slot-scope="scope">
+            <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="xcxssrqgj"
@@ -369,6 +381,9 @@
           align="center"
           width="210px"
           label="新车型实施日期">
+          <template slot-scope="scope">
+            <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
@@ -429,7 +444,6 @@
             <el-button
               class="common-button-default"
               type="danger"
-              style="margin-left: 0px"
               size="small" @click="moveDown(scope.$index, scope.row)"
               v-if="!disabledFlag"
             >下移</el-button>
@@ -540,6 +554,7 @@ export default {
       nylxMap: {},
       zrbmMap: {},
       sycpxMap: {},
+      zrbmOptions: [],
       selectSearch : [],
       // 新增、编辑 基础信息字段
       sarAccessEO: {
@@ -1244,6 +1259,19 @@ export default {
         _this: this
       }, res =>{
         this.sarAccessInfoSearchList = res.data.list
+        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)
+        })
+        console.log(this.sarAccessInfoSearchList)
       }, e => {
 
       })