From 58c00b6c72fc2134ff22702713779aeed74cf70c Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Wed, 21 Jul 2021 11:13:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=B0=E5=A2=9E=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E4=B8=8A=E4=BC=A0=E5=8F=AF=E4=BB=A5=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/listOfCountries.vue                  |  4 +-
 .../pages/addEdit.vue                         | 43 ++++++++++++++++++-
 .../pages/otherAddEit.vue                     | 10 ++++-
 .../pages/projectAddEit.vue                   | 10 ++++-
 4 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index b505cde78..9906b3846 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -87,7 +87,7 @@
           label="国家/地区"
           align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.countryArea.indexOf(',') >= 0">
+            <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>
@@ -138,7 +138,7 @@
           label="更新时间"
           align="center">
           <template slot-scope="scope">
-            <div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD hh:mm:ss')  : scope.row.updateTime }}</div>
+            <div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD')  : scope.row.updateTime }}</div>
           </template>
         </el-table-column>
         <el-table-column
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index fe74d634f..9a8810380 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -70,6 +70,7 @@
                   :on-remove="delFileInfo"
                   :on-success="uploadBackSuccess"
                   :before-upload="beforeUpload"
+                  :on-preview="handleOnPreview"
               >
                 <el-button class="common-button-default" size="mini">
                   点击上传
@@ -225,17 +226,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
@@ -376,6 +386,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"
@@ -383,6 +396,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
@@ -554,6 +570,7 @@ export default {
       nylxMap: {},
       zrbmMap: {},
       sycpxMap: {},
+      zrbmOptions: [],
       selectSearch : [],
       // 新增、编辑 基础信息字段
       sarAccessEO: {
@@ -879,6 +896,14 @@ export default {
         fileList.pop()
       }
     },
+
+    // 点击上传的文件进行下载
+    handleOnPreview(file) {
+      let attId = file.id
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
     // 相关附件 上传之前钩子
     beforeUpload (file) {
       var filename = file.name
@@ -1257,6 +1282,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 => {
       })
     },
@@ -1714,6 +1752,7 @@ export default {
         _this: this
       }, res => {
         this.sarAccessInfoList = res.data
+        console.log(res.data)
       }, e => {
       })
     },
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 6c2af2375..28e717fee 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -55,6 +55,7 @@
                 :on-remove="delFileInfo"
                 :on-success="uploadBackSuccess"
                 :before-upload="beforeUpload"
+                :on-preview="handleOnPreview"
               >
                 <el-button class="common-button-default" size="mini">
                   点击上传
@@ -1716,7 +1717,14 @@ export default {
         this.$set(this.zrbmMap, item.value, item.label)
         this.$set(this.sycpxMap, item.value, item.label)
       })
-    }
+    },
+    // 点击上传的文件进行下载
+    handleOnPreview(file) {
+      let attId = file.id
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
   },
   watch: {
     // 监听 清单类型
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index ecf20717b..db97c6e44 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -55,6 +55,7 @@
                 :on-remove="delFileInfo"
                 :on-success="uploadBackSuccess"
                 :before-upload="beforeUpload"
+                :on-preview="handleOnPreview"
               >
                 <el-button class="common-button-default" size="mini">
                   点击上传
@@ -1716,7 +1717,14 @@ export default {
         this.$set(this.zrbmMap, item.value, item.label)
         this.$set(this.sycpxMap, item.value, item.label)
       })
-    }
+    },
+    // 点击上传的文件进行下载
+    handleOnPreview(file) {
+      let attId = file.id
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
   },
   watch: {
     // 监听 清单类型