From 6b2edd514efd14e23f03f2af6357ced5b7883e01 Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Tue, 20 Jul 2021 16:37:28 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/listOfCountries.vue                  | 14 ++++
 .../page/listOther.vue                        |  3 +-
 .../page/listProject.vue                      |  3 +-
 .../pages/addEdit.vue                         | 70 ++++++++++++++---
 .../pages/details.vue                         | 76 +++++++++++++++----
 .../pages/otherAddEit.vue                     | 73 ++++++++++++++----
 .../pages/projectAddEit.vue                   | 73 ++++++++++++++----
 7 files changed, 257 insertions(+), 55 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index 3b853fd65..b505cde78 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -86,6 +86,12 @@
           prop="countryArea"
           label="国家/地区"
           align="center">
+          <template slot-scope="scope">
+            <span v-if="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"
@@ -170,6 +176,7 @@ export default {
   name: "listOfCountries",
   data() {
     return {
+      countryAreaMap: {},
       searching: false,
       total: 0,
       page: 1,
@@ -349,6 +356,12 @@ export default {
           fileIds: item.fileIds
         }
       });
+    },
+    // 将文本状态的id与name对应
+    setMap(data){
+      data.forEach(item => {
+        this.$set(this.countryAreaMap, item.value, item.label)
+      })
     }
   },
   mounted() {
@@ -359,6 +372,7 @@ export default {
       _this: this
     }, res => {
       this.countryOptions = res.data.COUNTRY;
+      this.setMap(this.countryOptions)
     }, e => {
     });
   }
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
index f168e45d8..a2ca95cd1 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
@@ -352,7 +352,8 @@ export default {
       this.$router.push({
         name: "OtherAddEit",
         query: {
-          id: item.id
+          id: item.id,
+          fileIds: item.fileIds
         }
       });
     }
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
index 6c669dccf..505201a52 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
@@ -355,7 +355,8 @@ export default {
       this.$router.push({
         name: "ProjectAddEit",
         query: {
-          id: item.id
+          id: item.id,
+          fileIds: item.fileIds
         }
       });
     }
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 22dd24b43..fe74d634f 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -242,6 +242,9 @@
               prop="textStatus"
               width="120px"
               label="文本状态">
+            <template slot-scope="scope">
+              <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+            </template>
           </el-table-column>
         </el-table>
         <el-table
@@ -336,25 +339,31 @@
         >
         </el-table-column>
         <el-table-column
-          prop="issueTime"
+          prop="standEnName"
           align="center"
           width="180px"
           label="英文名称">
         </el-table-column>
         <el-table-column
-          prop="issueTime"
+          prop="typeApplicable"
           align="center"
           width="180px"
           label="适用车型">
+          <template slot-scope="scope">
+            <span>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
+          </template>
         </el-table-column>
         <el-table-column
-          prop="issueTime"
+          prop="nylx"
           align="center"
           width="180px"
           label="能源类型">
+          <template slot-scope="scope">
+            <span>{{ nylxMap[scope.row.nylx] }}</span>
+          </template>
         </el-table-column>
         <el-table-column
-          prop="issueTime"
+          prop="putTime"
           sortable
           align="center"
           width="210px"
@@ -362,14 +371,14 @@
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
-          prop="zccssrq"
+          prop="zccssrqgj"
           sortable
           width="210px"
           align="center"
           label="在产车实施日期">
         </el-table-column>
         <el-table-column
-          prop="XCXSSRQ"
+          prop="xcxssrqgj"
           sortable
           align="center"
           width="210px"
@@ -377,40 +386,53 @@
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
-          prop="zccssrq"
+          prop="zrbm"
           width="210px"
           align="center"
           label="责任部门">
+          <template slot-scope="scope">
+            <span>{{ zrbmMap[scope.row.zrbm] }}</span>
+          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
-          prop="textStatus"
+          prop="sycpx"
           width="180px"
           align="center"
           label="适用产品线">
+          <template slot-scope="scope">
+            <span>{{ sycpxMap[scope.row.sycpx] }}</span>
+          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
-          prop="textStatus"
+          prop="cycvppsbm"
+          width="210px"
+          align="center"
+          label="乘用车VPPS编码">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="cycvppscn"
           width="210px"
           align="center"
           label="乘用车VPPS中文名称">
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
-          prop="textStatus"
+          prop="kccvppsbm"
           align="center"
           width="210px"
           label="卡车VPPS编码">
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
-          prop="textStatus"
+          prop="kccvppscn"
           align="center"
           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"
@@ -527,6 +549,11 @@ export default {
     //   }
     // }
     return {
+      textStatusMap: {},
+      typeApplicableMap: {},
+      nylxMap: {},
+      zrbmMap: {},
+      sycpxMap: {},
       selectSearch : [],
       // 新增、编辑 基础信息字段
       sarAccessEO: {
@@ -1689,6 +1716,16 @@ export default {
         this.sarAccessInfoList = res.data
       }, e => {
       })
+    },
+    // 将文本状态的id与name对应
+    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)
+      })
     }
   },
   watch: {
@@ -1725,6 +1762,15 @@ export default {
       this.ROLELIST = res.data.ROLELIST
       this.GXHBQOptions = res.data.GXHBQXX
       this.askNatureOptions = res.data.ACCESSTYPE
+      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+      this.categoryOptions = res.data.NYLXCLASS // 能源类型
+      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.getGzzOption()
     }, e => {
     })
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index fbc1048fe..2699627a3 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -11,7 +11,10 @@
       <div v-show="heightShow" class="transition-box">
         <p class="transition-box-p">
           <label class="transition-box-label">国家/地区：</label>
-          <span class="transition-box-span">{{ sarAccessEO.countryArea }}</span>
+          <span class="transition-box-span" v-if="sarAccessEO.countryArea.indexOf(',') >= 0">
+              <span>{{ sarAccessEO.countryArea }}</span>
+            </span>
+          <span class="transition-box-span" v-else>{{ countryAreaMap[sarAccessEO.countryArea] }}</span>
         </p>
         <p class="transition-box-p">
           <label class="transition-box-label">清单说明：</label>
@@ -124,31 +127,35 @@
           <el-table-column
             prop="standName"
             label="中文名称"
-            align="center"
-            fixed="left"
             width="180px"
           >
           </el-table-column>
           <el-table-column
-            prop="issueTime"
+            prop="standEnName"
             align="center"
             width="180px"
             label="英文名称">
           </el-table-column>
           <el-table-column
-            prop="issueTime"
+            prop="typeApplicable"
             align="center"
             width="180px"
             label="适用车型">
+            <template slot-scope="scope">
+              <span>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
+            </template>
           </el-table-column>
           <el-table-column
-            prop="issueTime"
+            prop="nylx"
             align="center"
             width="180px"
             label="能源类型">
+            <template slot-scope="scope">
+              <span>{{ nylxMap[scope.row.nylx] }}</span>
+            </template>
           </el-table-column>
           <el-table-column
-            prop="issueTime"
+            prop="putTime"
             sortable
             align="center"
             width="210px"
@@ -156,14 +163,14 @@
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="zccssrq"
+            prop="zccssrqgj"
             sortable
             width="210px"
             align="center"
             label="在产车实施日期">
           </el-table-column>
           <el-table-column
-            prop="xcxssrq"
+            prop="xcxssrqgj"
             sortable
             align="center"
             width="210px"
@@ -171,35 +178,48 @@
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="zccssrq"
+            prop="zrbm"
             width="210px"
             align="center"
             label="责任部门">
+            <template slot-scope="scope">
+              <span>{{ zrbmMap[scope.row.zrbm] }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="textStatus"
+            prop="sycpx"
             width="180px"
             align="center"
             label="适用产品线">
+            <template slot-scope="scope">
+              <span>{{ sycpxMap[scope.row.sycpx] }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="textStatus"
+            prop="cycvppsbm"
+            width="210px"
+            align="center"
+            label="乘用车VPPS编码">
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="cycvppscn"
             width="210px"
             align="center"
             label="乘用车VPPS中文名称">
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="textStatus"
+            prop="kccvppsbm"
             align="center"
             width="210px"
             label="卡车VPPS编码">
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="textStatus"
+            prop="kccvppscn"
             align="center"
             width="210px"
             label="卡车VPPS中文名称">
@@ -251,12 +271,17 @@
 
 <script>
 import { interfaceUrl } from "@/sysConfig";
-import { exportFile } from '@/api/unqualProcess'
 
 export default {
   name: "AccessStandardDetails",
   data() {
     return {
+      textStatusMap: {},
+      typeApplicableMap: {},
+      nylxMap: {},
+      zrbmMap: {},
+      sycpxMap: {},
+      countryAreaMap: {},
       standinfoList: [],
       standardFormTotal: 0,
       relateDialog: false,
@@ -560,6 +585,17 @@ export default {
     doLayout() {
       this.$refs.adminTable && this.$refs.adminTable.doLayout();
       this.$refs.skillTable && this.$refs.skillTable.doLayout();
+    },
+    // 将文本状态的id与name对应
+    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)
+      })
     }
   },
   mounted() {
@@ -589,6 +625,16 @@ export default {
       this.ROLELIST = res.data.ROLELIST;
       this.GXHBQOptions = res.data.GXHBQXX;
       this.askNatureOptions = res.data.ACCESSTYPE;
+      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+      this.categoryOptions = res.data.NYLXCLASS // 能源类型
+      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.getGzzOption();
     }, e => {
     });
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index e2308f462..caab34005 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -227,6 +227,9 @@
             prop="textStatus"
             width="120px"
             label="文本状态">
+            <template slot-scope="scope">
+              <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+            </template>
           </el-table-column>
         </el-table>
         <el-table
@@ -321,25 +324,31 @@
         >
         </el-table-column>
         <el-table-column
-          prop="issueTime"
+          prop="standEnName"
           align="center"
           width="180px"
           label="英文名称">
         </el-table-column>
         <el-table-column
-          prop="issueTime"
+          prop="typeApplicable"
           align="center"
           width="180px"
           label="适用车型">
+          <template slot-scope="scope">
+            <span>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
+          </template>
         </el-table-column>
         <el-table-column
-          prop="issueTime"
+          prop="nylx"
           align="center"
           width="180px"
           label="能源类型">
+          <template slot-scope="scope">
+            <span>{{ nylxMap[scope.row.nylx] }}</span>
+          </template>
         </el-table-column>
         <el-table-column
-          prop="issueTime"
+          prop="putTime"
           sortable
           align="center"
           width="210px"
@@ -347,14 +356,14 @@
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
-          prop="zccssrq"
+          prop="zccssrqgj"
           sortable
           width="210px"
           align="center"
           label="在产车实施日期">
         </el-table-column>
         <el-table-column
-          prop="XCXSSRQ"
+          prop="xcxssrqgj"
           sortable
           align="center"
           width="210px"
@@ -362,35 +371,48 @@
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
-          prop="zccssrq"
+          prop="zrbm"
           width="210px"
           align="center"
           label="责任部门">
+          <template slot-scope="scope">
+            <span>{{ zrbmMap[scope.row.zrbm] }}</span>
+          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
-          prop="textStatus"
+          prop="sycpx"
           width="180px"
           align="center"
           label="适用产品线">
+          <template slot-scope="scope">
+            <span>{{ sycpxMap[scope.row.sycpx] }}</span>
+          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
-          prop="textStatus"
+          prop="cycvppsbm"
+          width="210px"
+          align="center"
+          label="乘用车VPPS编码">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="cycvppscn"
           width="210px"
           align="center"
           label="乘用车VPPS中文名称">
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
-          prop="textStatus"
+          prop="kccvppsbm"
           align="center"
           width="210px"
           label="卡车VPPS编码">
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
-          prop="textStatus"
+          prop="kccvppscn"
           align="center"
           width="210px"
           label="卡车VPPS中文名称">
@@ -511,11 +533,17 @@ export default {
     //   }
     // }
     return {
+      textStatusMap: {},
+      typeApplicableMap: {},
+      nylxMap: {},
+      zrbmMap: {},
+      sycpxMap: {},
       selectSearch : [],
       // 新增、编辑 基础信息字段
       sarAccessEO: {
         id: '',
         sortKey: 4,
+        fileIds: '',
         detailedList: '',
         detailedListName: '',
         energyKind: '',
@@ -1167,7 +1195,7 @@ export default {
             this.fileInfoList.map(item => {
               relateFile.push(item.id)
             })
-            sarAccessEO.relateFile = relateFile.join(',')
+            sarAccessEO.fileIds = relateFile.join(',')
           }
           if (!sarAccessEO.id) {
             // 新增
@@ -1584,7 +1612,7 @@ export default {
     // 请求上传的文件信息
     getFileInfo () {
       this.$http.get('att/attFile/getMultiFileInfos', {
-        fileIds: this.sarAccessEO.relateFile
+        fileIds: this.$route.query.fileIds
       }, {
         _this: this
       }, res => {
@@ -1678,6 +1706,16 @@ export default {
       }, e => {
 
       })
+    },
+    // 将文本状态的id与name对应
+    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)
+      })
     }
   },
   watch: {
@@ -1714,6 +1752,15 @@ export default {
       this.ROLELIST = res.data.ROLELIST
       this.GXHBQOptions = res.data.GXHBQXX
       this.askNatureOptions = res.data.ACCESSTYPE
+      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+      this.categoryOptions = res.data.NYLXCLASS // 能源类型
+      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.getGzzOption()
     }, e => {
     })
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 214ba8390..b1b3ba854 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -227,6 +227,9 @@
             prop="textStatus"
             width="120px"
             label="文本状态">
+            <template slot-scope="scope">
+              <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+            </template>
           </el-table-column>
         </el-table>
         <el-table
@@ -321,25 +324,31 @@
         >
         </el-table-column>
         <el-table-column
-          prop="issueTime"
+          prop="standEnName"
           align="center"
           width="180px"
           label="英文名称">
         </el-table-column>
         <el-table-column
-          prop="issueTime"
+          prop="typeApplicable"
           align="center"
           width="180px"
           label="适用车型">
+          <template slot-scope="scope">
+            <span>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
+          </template>
         </el-table-column>
         <el-table-column
-          prop="issueTime"
+          prop="nylx"
           align="center"
           width="180px"
           label="能源类型">
+          <template slot-scope="scope">
+            <span>{{ nylxMap[scope.row.nylx] }}</span>
+          </template>
         </el-table-column>
         <el-table-column
-          prop="issueTime"
+          prop="putTime"
           sortable
           align="center"
           width="210px"
@@ -347,14 +356,14 @@
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
-          prop="zccssrq"
+          prop="zccssrqgj"
           sortable
           width="210px"
           align="center"
           label="在产车实施日期">
         </el-table-column>
         <el-table-column
-          prop="XCXSSRQ"
+          prop="xcxssrqgj"
           sortable
           align="center"
           width="210px"
@@ -362,35 +371,48 @@
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
-          prop="zccssrq"
+          prop="zrbm"
           width="210px"
           align="center"
           label="责任部门">
+          <template slot-scope="scope">
+            <span>{{ zrbmMap[scope.row.zrbm] }}</span>
+          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
-          prop="textStatus"
+          prop="sycpx"
           width="180px"
           align="center"
           label="适用产品线">
+          <template slot-scope="scope">
+            <span>{{ sycpxMap[scope.row.sycpx] }}</span>
+          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
-          prop="textStatus"
+          prop="cycvppsbm"
+          width="210px"
+          align="center"
+          label="乘用车VPPS编码">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="cycvppscn"
           width="210px"
           align="center"
           label="乘用车VPPS中文名称">
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
-          prop="textStatus"
+          prop="kccvppsbm"
           align="center"
           width="210px"
           label="卡车VPPS编码">
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
-          prop="textStatus"
+          prop="kccvppscn"
           align="center"
           width="210px"
           label="卡车VPPS中文名称">
@@ -511,11 +533,17 @@ export default {
     //   }
     // }
     return {
+      textStatusMap: {},
+      typeApplicableMap: {},
+      nylxMap: {},
+      zrbmMap: {},
+      sycpxMap: {},
       selectSearch : [],
       // 新增、编辑 基础信息字段
       sarAccessEO: {
         id: '',
         sortKey: 2,
+        fileIds: '',
         projectName: '',
         detailedListName: '',
         energyKind: '',
@@ -1168,7 +1196,7 @@ export default {
             this.fileInfoList.map(item => {
               relateFile.push(item.id)
             })
-            sarAccessEO.relateFile = relateFile.join(',')
+            sarAccessEO.fileIds = relateFile.join(',')
           }
           if (!sarAccessEO.id) {
             // 新增
@@ -1585,7 +1613,7 @@ export default {
     // 请求上传的文件信息
     getFileInfo () {
       this.$http.get('att/attFile/getMultiFileInfos', {
-        fileIds: this.sarAccessEO.relateFile
+        fileIds: this.$route.query.fileIds
       }, {
         _this: this
       }, res => {
@@ -1679,6 +1707,16 @@ export default {
       }, e => {
 
       })
+    },
+    // 将文本状态的id与name对应
+    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)
+      })
     }
   },
   watch: {
@@ -1715,6 +1753,15 @@ export default {
       this.ROLELIST = res.data.ROLELIST
       this.GXHBQOptions = res.data.GXHBQXX
       this.askNatureOptions = res.data.ACCESSTYPE
+      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+      this.categoryOptions = res.data.NYLXCLASS // 能源类型
+      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.getGzzOption()
     }, e => {
     })

From 55ed51632e9f5513e0c36303c4098fb056fdea1c Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Tue, 20 Jul 2021 16:40:25 +0800
Subject: [PATCH 2/3] =?UTF-8?q?bug:=20=E4=BF=AE=E6=94=B9=E5=9B=BD=E5=86=85?=
 =?UTF-8?q?/=E5=A4=96=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../details/otherStandardDetails/index.vue    |   2 +-
 .../components/CollectionStandard.vue         |   9 +-
 .../domesticStandardsAndRegulations/index.vue | 210 ++++++++++++++++--
 .../foreignStandardsAndRegulations/index.vue  |   3 +-
 4 files changed, 201 insertions(+), 23 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 97452ae8a..e94477eb5 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -246,7 +246,7 @@
                   v-for="(file, fileIndex) in child.value"
                   :key="fileIndex"
                 >
-                |{{file.id}}|
+                  <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>
                   <!--发布稿、增补件单独设置下载权限-->
                   <template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
                   || child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
diff --git a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
index 0ff5123cc..1f77c4b61 100644
--- a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
+++ b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
@@ -124,11 +124,10 @@ export default {
     },
     // 查询、加载数据
     selectStandard () {
-      this.$http.get('sarPersonalCenter/sar-user-star/getList', {
-        current: this.page,
-        size: this.$store.getters.userInfo.configContent,
-        userId: this.$store.getters.userInfo.userId,
-        name: this.search.name
+      this.$http.get('person/personCollect/page', {
+        pageNo: this.page,
+        pageSize: this.$store.getters.userInfo.configContent,
+        collectTitle: this.search.name
       }, {
         _this: this,
         loading: 'loading'
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 02e4c0ce2..f1522029e 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1006,6 +1006,11 @@
               <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"
                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
             </el-form-item>
+<!--            标准英文名称-->
+            <el-form-item :label="$t('m.standardEnglishName')" class="serch-form-item">
+              <el-input v-model="sarStandardsSearch.standEnName" :placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"
+                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+            </el-form-item>
 <!--            标准类别-->
             <el-form-item :label="$t('m.standardCategory')"  class="serch-form-item">
               <search-select
@@ -1027,20 +1032,161 @@
               <el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"
                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
             </el-form-item>
+<!--            标准年份-->
+            <el-form-item :label="$t('m.standardYear')"  class="serch-form-item">
+              <el-date-picker
+                  v-model="sarStandardsSearch.standYear"
+                  type="date"
+                  placeholder="根据标准年份查找">
+              </el-date-picker>
+            </el-form-item>
+            <!--            标准发布日期-->
+            <el-form-item label="标准发布日期"  class="serch-form-item">
+              <el-date-picker
+                  v-model="sarStandardsSearch.issueTime"
+                  type="date"
+                  placeholder="根据标准发布日期查找">
+              </el-date-picker>
+            </el-form-item>
+<!--            标准性质-->
+            <el-form-item :label="$t('m.standNatureShow')" class="serch-form-item">
+              <el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
+<!--            是否纳入标准清单-->
+            <el-form-item title="是否纳入标准清单" label="是否纳入标准清单">
+              <el-select v-model="sarStandardsSearch.isRelateAccess" class="advanced-one" placeholder="根据是否纳入标准清单查找">
+                <el-option value="yes" label="是"></el-option>
+                <el-option value="no" label="否"></el-option>
+              </el-select>
+            </el-form-item>
+<!--            实施日期-->
+            <el-form-item label="实施日期">
+              <el-date-picker
+                  v-model="sarStandardsSearch.putTime"
+                  type="date"
+                  placeholder="根据实施日期查找">
+              </el-date-picker>
+            </el-form-item>
+<!--            新车型实施日期-->
+            <el-form-item title="新车型实施日期" label="新车型实施日期">
+              <el-date-picker
+                  v-model="sarStandardsSearch.XCXTime"
+                  type="date"
+                  placeholder="根据新车型实施日期查找">
+              </el-date-picker>
+            </el-form-item>
+<!--            在产车实施日期-->
+            <el-form-item title="在产车实施日期" label="在产车实施日期">
+              <el-date-picker
+                  v-model="sarStandardsSearch.ZCCTime"
+                  type="date"
+                  placeholder="根据在产车实施日期查找">
+              </el-date-picker>
+            </el-form-item>
+<!--            归口管理部门-->
+            <el-form-item label="归口管理部门">
+              <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据归口管理部门查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+<!--            起草单位-->
+            <el-form-item label="起草单位">
+              <el-select v-model="sarStandardsSearch.qcdw" placeholder="根据起草单位查找" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in qcdwOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
+<!--            我司参与深度-->
+            <el-form-item label="我司参与深度">
+              <el-select v-model="sarStandardsSearch.nameShow" placeholder="请选择我司参与深度" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
+
+<!--            能源类型-->
+            <el-form-item label="能源类型">
+              <el-select v-model="sarStandardsSearch.energyKind" placeholder="请选择能源类型" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
 <!--            适用车型-->
             <el-form-item :label="$t('m.applicableModels')"  class="serch-form-item">
-              <el-select v-model="sarStandardsSearch.cllx" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
+              <el-select v-model="sarStandardsSearch.applyArctic" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
             </el-form-item>
 <!--            适用产品线（新增字段）-->
             <el-form-item :label="$t('m.applicableProductLine')"  class="serch-form-item">
-              <el-select v-model="sarStandardsSearch.nylx" :placeholder="$t('m.searchByApplicableProductLine')" clearable
+              <el-select v-model="sarStandardsSearch.sycpx" :placeholder="$t('m.searchByApplicableProductLine')" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in categoryOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
             </el-form-item>
+<!--            适用认证-->
+            <el-form-item label="适用认证">
+              <el-select v-model="sarStandardsSearch.syzr" placeholder="根据适用认证查找" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in syzrOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
+<!--            责任部门-->
+            <el-form-item label="责任部门">
+              <el-select v-model="sarStandardsSearch.zrbm" placeholder="根据责任部门查找" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
+<!--            责任工程师-->
+            <el-form-item label="责任工程师">
+              <el-select v-model="sarStandardsSearch.dutyEngineer" placeholder="根据责任工程师查找" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
+<!--            关联模块-VPPS编码-->
+            <el-form-item title="关联模块-VPPS编码" label="关联模块-VPPS编码" prop="standNumber">
+              <el-input v-model="sarStandardsSearch.svpps" clearable
+                        placeholder="根据关联模块-VPPS编码查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+<!--            代替标准号-->
+            <el-form-item label="代替标准号">
+              <el-input v-model="sarStandardsSearch.replaceStandNum" clearable placeholder="根据代替标准号查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+<!--            关联模块-中文名称-->
+            <el-form-item title="关联模块-中文名称" label="关联模块-中文名称" prop="standNumber">
+              <el-input v-model="sarStandardsSearch.standNumber" clearable
+                        placeholder="根据关联模块-中文名称"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+<!--            采标编号-->
+            <el-form-item label="采标编号" prop="nameShow">
+              <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据采标编号查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+<!--            采标程度-->
+            <el-form-item label="采标程度" prop="standNumber">
+              <el-input v-model="sarStandardsSearch.standNumber" clearable
+                        placeholder="根据采标程度查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+<!--            引用标准-->
+            <el-form-item label="引用标准">
+              <el-input v-model="sarStandardsSearch.citeStand" clearable placeholder="根据引用标准查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+<!--            被引用标准-->
+            <el-form-item label="被引用标准">
+              <el-input v-model="sarStandardsSearch.citedStand" clearable
+                        placeholder="根据被引用标准查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
 <!--            关联模块（新增字段）-->
             <el-form-item :label="$t('m.associatedModule')"  class="serch-form-item">
               <el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable
@@ -1253,6 +1399,12 @@ export default {
       categoryOptions: [], // 所属类别下拉框
       categoryConfigOptions: [], // 所属类别下拉框
       assemClassOptions: [], // 总成分类下拉框
+      qcdwOptions: [], // 起草单位
+      nylxOptions: [], // 能源类型
+      sycpxOptions: [], // 适用产品线
+      syzrOptions: [], // 适用认证
+      zrbmOptions: [], // 责任部门
+      zrgcsOptions: [], // 责任工程师
       standAttributeList: [],
       sarStandardsSearch: {
         page: 1,
@@ -1261,19 +1413,33 @@ export default {
         validFlag: '0',
         menuId: '',
         country: '',
-        standNumber: '',
-        standName: '',
-        standState: '',
-        standNature: '',
-        issueTime: '',
-        // applyArctic: '',
-        replaceStandNum: '',
-        // replaceStandNumCope: '',
-        // replaceStandNumList: [],
-        replacedStandNum: '',
+        standNumber: '', // 标准编号
+        standName: '', // 标准名称
+        standState: '', // 标准状态
+        issueTime: '', // 标准发布日期
+        svpps: '', // 关联模块-VPPS编码
+        replaceStandNum: '', // 代替标准号
+        replacedStandNum: '',  // 	被代替标准号
+        citeStand: '',  // 	引用标准
+        citedStand: '',  // 	被引用标准
         synopsis: '', // 内容摘要
-        // category: '', // 所属类别
-        standSort: '' // 标准类别
+        applyArctic: '', // 适用车型
+        sycpx: '', // 适用产品线
+        syzr: '', // 适用认证
+        zrbm: '', // 责任部门
+        dutyEngineer: '', // 责任工程师
+        standSort: '', // 标准类别
+        standYear: '', // 标准年份
+        standEnName: '', // 标准英文名称
+        standNature: '', // 标准性质
+        putTime: '', // 实施日期
+        isRelateAccess: '', // 是否纳入标准清单
+        nameShow: '', // 我司参与深度
+        qcdw: '', // 起草单位
+        nameShow: '', // 归口管理部门
+        ZCCTime: '', // 在产车实施日期
+        XCXTime: '', // 新车型实施日期
+        energyKind: '', // 能源类型
       }, // 分页查询过程中用到的对象
       // 树形结构
       // tree function
@@ -4077,7 +4243,7 @@ export default {
         this.standNatureOptions = res.data.SARPROPERTY // 标准性质
         this.standStateOptions = res.data.WBZTCLASS // 文本状态
         this.standSystemOptions = res.data.BZTXCLASS // 标准体系
-        this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
+        this.applyArcticOptions = res.data.SYCXCLASS // 适用车型
         this.categoryOptions = res.data.NYLXCLASS // 能源类型
         this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
         this.cysdOptions = res.data.WSCYSD // 我司参与深度
@@ -4085,6 +4251,12 @@ export default {
         this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
         this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
         this.txlbOptions = res.data.TXLBCLASS // 体系类别
+      this.qcdwOptions = res.data.QCDW // 起草单位
+      this.nylxOptions = res.data.NYLXCLASS // 能源类型
+      this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+      this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+      this.syzrOptions = res.data.SYRZCLASS // 适用认证
       this.getGzzOption()
       this.setMap(this.standStateOptions)
       console.log(this.standStateOptions, '文本状态')
@@ -4234,6 +4406,9 @@ export default {
       text-align: center;
       margin-top: 6px;
       background: #F9F9F9;
+       overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis
     }
     /deep/.el-input__inner {
       height: 30px;
@@ -4242,5 +4417,8 @@ export default {
     }
   }
 }
+.el-date-editor.el-input, .el-date-editor.el-input__inner{
+  width: 190px
+}
 
 </style>
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 945faba41..00aa92163 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -231,7 +231,7 @@
                         取消收藏
                       </el-dropdown-item>
                       <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'">编辑</el-dropdown-item>
-                      <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'413e676a155d6eb2dfbe08df8cbcf682'">分享</el-dropdown-item>
+<!--                      <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'413e676a155d6eb2dfbe08df8cbcf682'">分享</el-dropdown-item>-->
                       <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'413e676a155d6eb2dfbe08df8cbcf682'">删除</el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
@@ -3960,6 +3960,7 @@ export default {
       this.assemClassOptions = res.data.ASSEMCLASSIFY // 总成分类
       this.categoryConfigOptions = res.data.CATEGORY
       this.standAttributeList = res.data.RULETYPE
+      this.qcdwOptions = res.data.QCDW
       this.getGzzOption()
       this.setMap(this.standStateOptions)
     }, e => {

From 7040dbe70685f94ec09af0757abf172616ace54d Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 20 Jul 2021 16:41:42 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue                 | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 38a043c73..622a6fc7e 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -2098,7 +2098,6 @@ export default {
           this.selectChildMenu(data)
           this.productModal = true
           // 取消所有的选中效果
-          this.handleSelectAll(false)
           this.productTitle = '编辑信息'
           // const newChild = { id: this.id++, label: 'testtest', children: [] };
           // if (!data.children) {
@@ -2112,7 +2111,6 @@ export default {
           this.selectChildMenu(data)
           this.productModal = true
           // 取消所有的选中效果
-          this.handleSelectAll(false)
           this.productTitle = '新增下级菜单信息'
           this.productModelAdd.dicTypeCode = ''
           // const newChild = { id: this.id++, label: 'testtest', children: [] };
@@ -2131,7 +2129,7 @@ export default {
               type: 'warning'
           }).then(() => {
               this.$http.delete("sarResource/ts-resource", {
-                  menuId: data.id
+                  resourceId: data.id
               }, res => {
               }, e => {
                   if(e.ok){