From cb528250cae04731f2fa1c89bc5eeb5e012dfdc0 Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Sat, 24 Jul 2021 16:30:28 +0800
Subject: [PATCH 1/5] =?UTF-8?q?bug=EF=BC=9A=E5=9B=BD=E5=86=85=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E7=BC=96=E8=BE=91=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=BA=94=E5=8E=BB=E6=8E=89=E8=A2=AB=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E6=A0=87=E5=87=86=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/treeSelect/treeSelectNew.vue        | 14 ++++++++++++++
 .../domesticStandardsAndRegulations/index.vue      |  1 +
 2 files changed, 15 insertions(+)

diff --git a/src/components/treeSelect/treeSelectNew.vue b/src/components/treeSelect/treeSelectNew.vue
index 1ac8eb973..b8a892ea0 100644
--- a/src/components/treeSelect/treeSelectNew.vue
+++ b/src/components/treeSelect/treeSelectNew.vue
@@ -218,6 +218,20 @@
                     this.isShowSelect = !this.isShowSelect;
                 }
             },
+          // 递归
+          getTreeData(data) {
+            // 循环遍历json数据
+            for (let i = 0; i < data.length; i++) {
+              if (data[i].children.length < 1) {
+                // children若为空数组，则将children设为undefined
+                delete data[i].children
+              } else {
+                // children若不为空数组，则继续 递归调用 本方法
+                this.getTreeData(data[i].children)
+              }
+            }
+            return data
+          },
             // 节点选中状态发生变化时的回调
             handleCheckChange () {
                 var checkedKeys = this.$refs.tree.getCheckedKeys(); // 所有被选中的节点的 key 所组成的数组数据
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index cec1fc816..e34a317ae 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -444,6 +444,7 @@
                     <custom-input-for-standards
                       :key="field.attrField"
                       :config="field"
+                      :class="field.attrField === 'BYYBJ' ? 'classDisplay' : ''"
                       v-model="sarStandardsInfoEO[field.attrField]"
                       :disabled="formdisableflag"
                     ></custom-input-for-standards>

From 8cfb1430584891f874cc224eb8f0e6978e0ed74e Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Sat, 24 Jul 2021 16:45:53 +0800
Subject: [PATCH 2/5] =?UTF-8?q?bug:=20=E5=85=A5=E5=BA=93=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=97=B6=E6=9C=AA=E5=BF=85=E5=A1=AB=E9=A1=B9=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=A1=AB=E5=86=99=EF=BC=8C=20=E5=9C=A8=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9F=A5=E7=9C=8B=EF=BC=8C=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=8C=E5=BA=94=E6=98=BE=E7=A4=BA=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue                | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index e34a317ae..b7a97c8e7 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -2291,8 +2291,10 @@ export default {
         Promise.all([this.queryDisplayLocation()]).then((values) => {
           const [displayLocation] = values
           console.log(this.formFieldList, 'assssssssssss')
+          console.log(item, 'itemitemitemitem')
           const formFieldList = this.formFieldList
             this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
+          console.log(item.attrInfoCaseMap, 'gggg大大大滴滴答答')
           if(this.sarStandardsInfoEO.standSystem){
               this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
           }
@@ -2303,10 +2305,9 @@ export default {
           }
           Object.keys(item.attrInfoMap || {}).forEach((key) => {
             if (item.attrInfoMap[key]) {
-              this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key])
+              this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key] === '[]' ? '' : item.attrInfoMap[key])
             }
           })
-
           const dynamicFormField = this.sarStandardsInfoEO
           this.sarStandardsInfoEO.EOPSSRQ = this.$moment(this.sarStandardsInfoEO.EOPSSRQ).isValid() ? this.$moment(this.sarStandardsInfoEO.EOPSSRQ) : this.sarStandardsInfoEO.EOPSSRQ
           this.sarStandardsInfoEO['id'] = item.id

From 33e84ae2bb51d7ffc666644353b6712342304bba Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Sat, 24 Jul 2021 16:54:02 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=96=B0=E5=A2=9E=E6=97=B6=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0value=E5=8F=98=E4=B8=BA=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/unqualProcess.js                      |  14 ++
 .../pages/addEdit.vue                         | 177 +++++++-------
 .../pages/details.vue                         |  79 +------
 .../pages/otherAddEit.vue                     | 214 +++++++++++------
 .../pages/projectAddEit.vue                   | 215 ++++++++++++------
 5 files changed, 422 insertions(+), 277 deletions(-)

diff --git a/src/api/unqualProcess.js b/src/api/unqualProcess.js
index a87c8a3ac..94d623b60 100644
--- a/src/api/unqualProcess.js
+++ b/src/api/unqualProcess.js
@@ -24,3 +24,17 @@ export function uploadFileText (data) {
     params: data
   })
 }
+export function dicTypeData (data) {
+  return axios({
+    url: 'api/sys/dictype/getDicTypeListCode',
+    method: 'get',
+    params: data
+  })
+}
+export function StandardsInfoPage (data) {
+  return axios({
+    url: 'api/sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',
+    method: 'get',
+    params: data
+  })
+}
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 69bb4a9e0..9300400fc 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -80,7 +80,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="标准名称" class="search-item">
+            <el-form-item  label="标准名称" v-if="sarAccessInfoSearch.dataSource !== 'TEMP'" class="search-item">
               <el-input
                   v-model="sarAccessInfoSearch.standName"
                   placeholder="请输入"
@@ -159,14 +159,6 @@
       </div>
       <div class="showSelectBox" v-if="!showSelectBox">
         <el-form  :model="sarAccessInfoSearch" class="label-input-form" v-if="!disabledFlag" inline>
-          <el-form-item label="标准名称"  class="search-item"  v-show="!isListType">
-            <el-input
-              v-model="sarAccessInfoSearch.standName"
-              placeholder="请输入"
-              :maxlength="100"
-              size="small"
-            />
-          </el-form-item>
           <el-form-item label="文本状态"  v-show="!isListType">
             <el-select
               v-model="sarAccessInfoSearch.textStatus"
@@ -191,15 +183,6 @@
               placeholder="选择发布日期">
             </el-date-picker>
           </el-form-item>
-          <el-form-item lable="更新时间"  v-show="isListType">
-            <el-date-picker
-              v-model="sarAccessInfoSearch.modifyTime"
-              type="date"
-              value-format="yyyy-MM-DD"
-              size="small"
-              placeholder="选择发布日期">
-            </el-date-picker>
-          </el-form-item>
           <el-form-item label="更新人"  v-show="isListType">
             <el-input
               v-model="sarAccessInfoSearch.standName"
@@ -207,6 +190,15 @@
               :maxlength="100"
               size="small"/>
           </el-form-item>
+          <el-form-item label="更新时间"  v-show="isListType">
+            <el-date-picker
+              v-model="sarAccessInfoSearch.modifyTime"
+              type="date"
+              size="small"
+              value-format="yyyy-MM-DD"
+              placeholder="选择更新日期">
+            </el-date-picker>
+          </el-form-item>
         </el-form>
       </div>
       <div class="action-bar">
@@ -403,18 +395,12 @@
           align="center"
           width="180px"
           label="适用车型">
-          <template slot-scope="scope">
-            <span>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
-          </template>
         </el-table-column>
         <el-table-column
           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="putTime"
@@ -453,9 +439,6 @@
           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
@@ -463,9 +446,6 @@
           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
@@ -495,7 +475,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>
-        <el-table-column width="240" label="操作">
+        <el-table-column width="240" align="center" label="操作">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"
@@ -657,7 +637,7 @@ import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPoli
 import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
 import stand from "../../../config/pages/attributeCustom/components/stand";
 import { mapGetters } from 'vuex'
-import { editDataInfo } from '@/api/unqualProcess'
+import { dicTypeData, StandardsInfoPage } from '@/api/unqualProcess'
 import {interfaceUrl} from "@/sysConfig";
 export default {
   name: 'ListOfStandardsAndRegulationsDetails',
@@ -682,25 +662,6 @@ export default {
     CustomRoleTree
   },
   data () {
-    // let validatePass = (rule, value, callback) => {
-    //   let list = []
-    //   //sarAccessInfoListADMIN  可能不存在
-    //   if (this.sarAccessInfoListADMIN.length > 0) {
-    //     for (let a  = 0; a < this.sarAccessInfoListADMIN.length;a++) {
-    //       list.push(this.sarAccessInfoListADMIN[a].code)
-    //     }
-    //   }
-    //   if (this.sarAccessInfoList.length > 0) {
-    //     for (let b = 0; b < this.sarAccessInfoList.length;b++) {
-    //       list.push(this.sarAccessInfoList[b].code)
-    //     }
-    //   }
-    //   for (let c = 0; c < list.length; c++) {
-    //     if (value === list[c]) {
-    //       callback(new Error('此标准号已存在'))
-    //     }
-    //   }
-    // }
     return {
       textStatusMap: {},
       countryAreaMap: {},
@@ -708,7 +669,6 @@ export default {
       nylxMap: {},
       zrbmMap: {},
       sycpxMap: {},
-      zrbmOptions: [],
       // 编辑抽屉状态
       drawerEdit: false,
       // 编辑框数据
@@ -762,8 +722,13 @@ export default {
       drawerCountryOptions: [], // 基础信息 国家list
       textStatusOptions: [], // 文本状态
       applyOptions: [], //基础信息适用领域list
-      applyArcticOptions: [], // 基础车型 适用车型list
+      /** ****************************/
+      zrbmOptions: [], // 责任部门
+      categoryOptions: [], // 能源类型
       energyKindOptions: [], // 能源种类list
+      sycpxOptions: [], // 适用产品线
+      applyArcticOptions: [], // 基础车型 适用车型list
+      /** ******************************/
       accessSarTypeOptions: [], // 要求类型list
       standSortOptions: [], // 标准类别
       standStateOptions: [], // 标准状态
@@ -1009,6 +974,20 @@ export default {
       uuid: '',
     }
   },
+  created() {
+    this.selectLawsStands()
+    dicTypeData().then(res => {
+      // 责任部门数据字典
+      this.zrbmOptions = res.data.ZRBMCLASS
+      // 能源类型数据字典
+      this.energyKindOptions = res.data.ENERGYTYPES
+      // this.categoryOptions = res.data.NYLXCLASS // 能源类型
+      // 适用车型数据字典
+      this.applyArcticOptions = res.data.PRODUCTTYPE
+      // 适用产品线数据字典
+      this.sycpxOptions = res.data.SYCPXCLASS
+    })
+  },
   methods: {
     // 高级检索
     selectMoreBtn () {
@@ -1427,7 +1406,6 @@ export default {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
             }
           }
-          console.log(rowlist2)
           rowlist = rowlist.join(',')
           rowlist1 = rowlist1.join(',')
           rowlist2 = rowlist2.join(',')
@@ -1487,22 +1465,9 @@ export default {
     },
     // 查询数据搜索 table 数据
     selectLawsStands () {
-      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, {
-        _this: this
-      }, res =>{
+      StandardsInfoPage(this.sarAccessInfoSearch).then(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)
-        })
+        this.drawerTotal = res.data.list.length
       }, e => {
       })
     },
@@ -1513,6 +1478,68 @@ export default {
     // 数据搜索 table select事件
     sarAccessInfoSearchSelect (val) {
       this.selectedAccInfoSearchList = val
+      this.selectedAccInfoSearchList.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)
+      })
+      this.selectedAccInfoSearchList.forEach(item => {
+        // 责任部门转换
+        if (item.zrbm !== null || item.zrbm !== "") {
+          let k = (item.zrbm || "").split(',')
+            for (let i in this.zrbmOptions) {
+              for (let m = 0; m< k.length; m++) {
+                if (this.zrbmOptions[i].value === k[m]) {
+                  k[m]  = this.zrbmOptions[i].label
+                }
+                item.zrbm = k.join(',')
+              }
+            }
+        }
+        // 能源类型转换
+        if (item.nylx !== null) {
+          let k = (item.nylx || "").split(',')
+          for (let i in this.categoryOptions) {
+            for (let m = 0; m< k.length; m++) {
+              if (this.categoryOptions[i].value === k[m]) {
+                k[m]  = this.categoryOptions[i].label
+              }
+              item.nylx = k.join(',')
+            }
+          }
+        }
+        // 适用车型转换
+        if (item.typeApplicable !== null) {
+          let k = (item.typeApplicable || "").split(',')
+          for (let i in this.energyKindOptions) {
+            for (let m = 0; m< k.length; m++) {
+              if (this.energyKindOptions[i].value === k[m]) {
+                k[m]  = this.energyKindOptions[i].label
+              }
+              item.typeApplicable = k.join(',')
+            }
+          }
+        }
+        // s适用产品线转换
+        if (item.sycpx !== null) {
+          let k = (item.sycpx || "").split(',')
+          for (let i in this.sycpxOptions) {
+            for (let m = 0; m< k.length; m++) {
+              if (this.sycpxOptions[i].value === k[m]) {
+                k[m]  = this.sycpxOptions[i].label
+              }
+              item.sycpx = k.join(',')
+            }
+          }
+        }
+      })
     },
     // 数据搜索 清单类型 table select事件
     accessSarTypeSelect (selectData) {
@@ -1865,7 +1892,7 @@ export default {
         name: routerName,
         params: {
           id: item.resId,
-          pageType: item.sarType
+          pageType: this.sarAccessInfoSearch.dataSource
         }
       })
       window.open(routeUrl.href, '_blank')
@@ -1967,7 +1994,6 @@ export default {
         _this: this
       }, res => {
         this.sarAccessInfoList = res.data
-        console.log(res.data)
       }, e => {
       })
     },
@@ -1988,7 +2014,6 @@ export default {
     isListType (newVal, oldVal) {
       this.sarAccessInfoSearchList = []
       this.sarAccessInfoSearch.page = 1
-      this.drawerTotal = 0
       this.selectedAccInfoSearchList = []
       this.accessSarTypeList = []
     }
@@ -2008,8 +2033,8 @@ export default {
     }, res => {
       this.allSelectOptions = res.data || {}
       this.regionOptions = res.data.REGION // 基础信息 区域list
-      this.applyArcticOptions = res.data.PRODUCTTYPE || [] // 基础车型 适用车型list
-      this.energyKindOptions = res.data.ENERGYTYPES || [] // 能源种类list
+      this.applyArcticOptions = res.data.PRODUCTTYPE // 基础车型 适用车型list
+      this.energyKindOptions = res.data.ENERGYTYPES // 能源种类list
       this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list
       this.applyOptions = res.data.COUNTRY  //适用区域list
       this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质
@@ -2024,10 +2049,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.getGzzOption()
     }, e => {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index 57619c646..a238ff300 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -13,13 +13,14 @@
     </div>
     <transition name="el-zoom-in-top">
       <div v-show="heightShow" class="transition-box">
-        <p class="transition-box-p">
+        <p class="transition-box-p"  v-if="sarAccessEO.sortKey === '1'">
           <label class="transition-box-label">国家/地区：</label>
           <span class="transition-box-span"  v-if="sarAccessEO.countryArea !== null && sarAccessEOInfo  > 0">
               <span>{{ sarAccessEO.countryArea }}</span>
             </span>
           <span class="transition-box-span" v-else>{{ countryAreaMap[sarAccessEO.countryArea] }}</span>
         </p>
+        <p v-else></p>
         <p class="transition-box-p">
           <label class="transition-box-label">清单说明：</label>
           <span class="transition-box-span">{{ sarAccessEO.remark || "-" }}</span>
@@ -102,15 +103,7 @@
           </el-button>
         </el-form>
         <div v-if="!showSelectBox">
-          <el-form  :model="standardForm" class="label-input-form" label-width="150px" inline>
-            <el-form-item label="中文名称"  class="search-item">
-              <el-input
-                v-model="standardForm.standName"
-                placeholder="请输入"
-                :maxlength="100"
-                size="small"
-              />
-            </el-form-item>
+          <el-form  :model="standardForm" class="label-input-form" label-width="108px" inline>
             <el-form-item label="英文名称"  class="search-item">
               <el-input
                 v-model="standardForm.standEnName"
@@ -119,7 +112,7 @@
                 size="small"
               />
             </el-form-item>
-            <el-form-item label="适用车型">
+            <el-form-item label="适用车型" class="labelBox"  label-width="61px">
               <el-select
                 class="showBox"
                 v-model="standardForm.typeApplicable"
@@ -151,22 +144,6 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="责任部门"  >
-              <el-select
-                class="showBox"
-                v-model="standardForm.zrbm"
-                placeholder="请选择"
-                filterable
-                size="small"
-              >
-                <el-option
-                  v-for="item in zrbmOptions"
-                  :value="item.value"
-                  :key="item.value"
-                  :label="item.label"
-                />
-              </el-select>
-            </el-form-item>
             <el-form-item label="适用产品线"  >
               <el-select
                 class="showBox"
@@ -183,47 +160,6 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="乘用车VPPS编码"  class="search-item">
-              <el-input
-                v-model="standardForm.cycvppsbm"
-                placeholder="请输入"
-                :maxlength="100"
-                size="small"
-              />
-            </el-form-item>
-            <el-form-item label="乘用车VPPS中文名称"  class="search-item">
-              <el-input
-                v-model="standardForm.cycvppscn"
-                placeholder="请输入"
-                :maxlength="100"
-                size="small"
-              />
-            </el-form-item>
-            <el-form-item label="卡车VPPS编码"  class="search-item">
-              <el-input
-                v-model="standardForm.kccvppsbm"
-                placeholder="请输入"
-                :maxlength="100"
-                size="small"
-              />
-            </el-form-item>
-            <el-form-item label="卡车VPPS中文名称"  class="search-item">
-              <el-input
-                v-model="standardForm.kccvppscn"
-                placeholder="请输入"
-                :maxlength="100"
-                size="small"
-              />
-            </el-form-item>
-<!--            <el-form-item label="标准实施日期">
-              <el-date-picker
-                v-model="standardForm.issueTime"
-                type="date"
-                value-format="yyyy-MM-DD"
-                size="small"
-                placeholder="选择发布日期">
-              </el-date-picker>
-            </el-form-item>-->
           </el-form>
         </div>
       </div>
@@ -780,6 +716,7 @@ export default {
       let accessRow = JSON.parse(sessionStorage.getItem("accessRow"));
       this.pageId = accessRow.id
       this.sarAccessEO = accessRow;
+      console.log(this.sarAccessEO)
       this.selectInfobyAccid();
       this.getOrgTreeSource();
       this.getFileInfo();
@@ -943,7 +880,11 @@ export default {
       }
     }
   }
-
+  .labelBox {
+    /deep/ .el-form-item__label {
+      padding-right: 5px;
+    }
+  }
   /deep/ .relateClass {
     & > button {
       height: 30px;
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 0ab7a1a5d..351a42d50 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -65,7 +65,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="标准名称" class="search-item">
+            <el-form-item label="标准名称" v-if="sarAccessInfoSearch.dataSource !== 'TEMP'" class="search-item">
               <el-input
                 v-model="sarAccessInfoSearch.standName"
                 placeholder="请输入"
@@ -92,21 +92,6 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="国家/地区" class="search-item" v-show="isListType">
-              <el-select
-                v-model="sarAccessInfoSearch.countryArea"
-                placeholder="请选择"
-                filterable
-              >
-                <el-option
-                  v-for="item in drawerCountryOptions"
-                  :value="item.value"
-                  :key="item.value"
-                  :label="item.label"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
             <el-form-item label="清单名称" prop="detailedListName" class="search-item" v-show="isListType">
               <el-input
                 v-model="sarAccessInfoSearch.detailedListName"
@@ -138,6 +123,58 @@
           </el-form>
         </div>
       </div>
+      <div class="showSelectBox" v-if="!showSelectBox">
+        <el-form  :model="sarAccessInfoSearch" class="label-input-form" label-width="70px" v-if="!disabledFlag" inline>
+          <el-form-item label="文本状态"  v-show="!isListType">
+            <el-select
+              v-model="sarAccessInfoSearch.textStatus"
+              placeholder="请选择"
+              filterable
+              size="small"
+            >
+              <el-option
+                v-for="item in textStatusOptions"
+                :value="item.value"
+                :key="item.value"
+                :label="item.label"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="发布日期"  v-show="!isListType">
+            <el-date-picker
+              v-model="sarAccessInfoSearch.issueTime"
+              type="date"
+              value-format="yyyy-MM-DD"
+              size="small"
+              placeholder="选择发布日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="项目类别"  v-show="isListType">
+            <el-input
+              size="small"
+              v-model="sarAccessInfoSearch.standSystem"
+              placeholder="请输入"
+              :maxlength="100"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="更新人"  v-show="isListType">
+            <el-input
+              v-model="sarAccessInfoSearch.standName"
+              placeholder="请输入"
+              :maxlength="100"
+              size="small"/>
+          </el-form-item>
+          <el-form-item label="更新时间"  v-show="isListType">
+            <el-date-picker
+              v-model="sarAccessInfoSearch.modifyTime"
+              type="date"
+              size="small"
+              value-format="yyyy-MM-DD"
+              placeholder="选择更新日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-form>
+      </div>
       <div class="action-bar">
         <el-button
           class="common-button-default"
@@ -326,18 +363,12 @@
           align="center"
           width="180px"
           label="适用车型">
-          <template slot-scope="scope">
-            <span>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
-          </template>
         </el-table-column>
         <el-table-column
           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="putTime"
@@ -374,7 +405,14 @@
           align="center"
           label="责任部门">
           <template slot-scope="scope">
-            <span>{{ zrbmMap[scope.row.zrbm] }}</span>
+            <span
+              v-for="(item, index) in zrbmOptions"
+              :key="index"
+              :value="item.value"
+              v-if="scope.row.value == item.value"
+            >
+              {{ item.label }}
+            </span>
           </template>
         </el-table-column>
         <el-table-column
@@ -383,9 +421,6 @@
           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
@@ -415,7 +450,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>
-        <el-table-column width="150" label="操作">
+        <el-table-column width="150" align="center" label="操作">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"
@@ -489,6 +524,7 @@ import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
 import stand from "../../../config/pages/attributeCustom/components/stand";
 import { mapGetters } from 'vuex'
 import {interfaceUrl} from "@/sysConfig";
+import {dicTypeData} from "@/api/unqualProcess";
 export default {
   name: 'OtherAddEit',
   components: {
@@ -512,32 +548,12 @@ export default {
     CustomRoleTree
   },
   data () {
-    // let validatePass = (rule, value, callback) => {
-    //   let list = []
-    //   //sarAccessInfoListADMIN  可能不存在
-    //   if (this.sarAccessInfoListADMIN.length > 0) {
-    //     for (let a  = 0; a < this.sarAccessInfoListADMIN.length;a++) {
-    //       list.push(this.sarAccessInfoListADMIN[a].code)
-    //     }
-    //   }
-    //   if (this.sarAccessInfoList.length > 0) {
-    //     for (let b = 0; b < this.sarAccessInfoList.length;b++) {
-    //       list.push(this.sarAccessInfoList[b].code)
-    //     }
-    //   }
-    //   for (let c = 0; c < list.length; c++) {
-    //     if (value === list[c]) {
-    //       callback(new Error('此标准号已存在'))
-    //     }
-    //   }
-    // }
     return {
       textStatusMap: {},
       typeApplicableMap: {},
       nylxMap: {},
       zrbmMap: {},
       sycpxMap: {},
-      zrbmOptions: [],
       selectSearch : [],
       // 新增、编辑 基础信息字段
       sarAccessEO: {
@@ -568,11 +584,18 @@ export default {
         ]
       },
       disabledFlag: false,
+      showSelectBox: true,
+      /** ****************************/
+      zrbmOptions: [], // 责任部门
+      categoryOptions: [], // 能源类型
+      energyKindOptions: [], // 能源种类list
+      sycpxOptions: [], // 适用产品线
+      applyArcticOptions: [], // 基础车型 适用车型list
+      /** ******************************/
+      textStatusOptions: [], // 文本状态
       regionOptions: [], // 基础信息 区域list
       drawerCountryOptions: [], // 基础信息 国家list
       applyOptions: [], //基础信息适用领域list
-      applyArcticOptions: [], // 基础车型 适用车型list
-      energyKindOptions: [], // 能源种类list
       accessSarTypeOptions: [], // 要求类型list
       standSortOptions: [], // 标准类别
       standStateOptions: [], // 标准状态
@@ -814,6 +837,20 @@ export default {
       uuid: '',
     }
   },
+  created() {
+    this.selectLawsStands()
+    dicTypeData().then(res => {
+      // 责任部门数据字典
+      this.zrbmOptions = res.data.ZRBMCLASS
+      // 能源类型数据字典
+      this.energyKindOptions = res.data.ENERGYTYPES
+      // this.categoryOptions = res.data.NYLXCLASS // 能源类型
+      // 适用车型数据字典
+      this.applyArcticOptions = res.data.PRODUCTTYPE
+      // 适用产品线数据字典
+      this.sycpxOptions = res.data.SYCPXCLASS
+    })
+  },
   methods: {
     // 高级检索
     selectMoreBtn () {
@@ -1241,19 +1278,7 @@ 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)
+        this.drawerTotal = res.data.list.length
       }, e => {
 
       })
@@ -1265,7 +1290,68 @@ export default {
     // 数据搜索 table select事件
     sarAccessInfoSearchSelect (val) {
       this.selectedAccInfoSearchList = val
-      console.log(val)
+      this.selectedAccInfoSearchList.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)
+      })
+      this.selectedAccInfoSearchList.forEach(item => {
+        // 责任部门转换
+        if (item.zrbm !== null || item.zrbm !== "") {
+          let k = (item.zrbm || "").split(',')
+          for (let i in this.zrbmOptions) {
+            for (let m = 0; m< k.length; m++) {
+              if (this.zrbmOptions[i].value === k[m]) {
+                k[m]  = this.zrbmOptions[i].label
+              }
+              item.zrbm = k.join(',')
+            }
+          }
+        }
+        // 能源类型转换
+        if (item.nylx !== null) {
+          let k = (item.nylx || "").split(',')
+          for (let i in this.categoryOptions) {
+            for (let m = 0; m< k.length; m++) {
+              if (this.categoryOptions[i].value === k[m]) {
+                k[m]  = this.categoryOptions[i].label
+              }
+              item.nylx = k.join(',')
+            }
+          }
+        }
+        // 适用车型转换
+        if (item.typeApplicable !== null) {
+          let k = (item.typeApplicable || "").split(',')
+          for (let i in this.energyKindOptions) {
+            for (let m = 0; m< k.length; m++) {
+              if (this.energyKindOptions[i].value === k[m]) {
+                k[m]  = this.energyKindOptions[i].label
+              }
+              item.typeApplicable = k.join(',')
+            }
+          }
+        }
+        // s适用产品线转换
+        if (item.sycpx !== null) {
+          let k = (item.sycpx || "").split(',')
+          for (let i in this.sycpxOptions) {
+            for (let m = 0; m< k.length; m++) {
+              if (this.sycpxOptions[i].value === k[m]) {
+                k[m]  = this.sycpxOptions[i].label
+              }
+              item.sycpx = k.join(',')
+            }
+          }
+        }
+      })
     },
     // 数据搜索 清单类型 table select事件
     accessSarTypeSelect (selectData) {
@@ -1780,7 +1866,7 @@ export default {
       this.ROLELIST = res.data.ROLELIST
       this.GXHBQOptions = res.data.GXHBQXX
       this.askNatureOptions = res.data.ACCESSTYPE
-      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+      this.zrbmOptions = res.data.ZRBMCLASS || [] // 责任部门
       this.categoryOptions = res.data.NYLXCLASS // 能源类型
       this.textStatusOptions = res.data.WBZTCLASS
       this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index d4970e303..ad7f9a9fe 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -65,7 +65,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="标准名称" class="search-item">
+            <el-form-item label="标准名称" v-if="sarAccessInfoSearch.dataSource !== 'TEMP'" class="search-item">
               <el-input
                 v-model="sarAccessInfoSearch.standName"
                 placeholder="请输入"
@@ -92,21 +92,6 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="国家/地区" class="search-item" v-show="isListType">
-              <el-select
-                v-model="sarAccessInfoSearch.countryArea"
-                placeholder="请选择"
-                filterable
-              >
-                <el-option
-                  v-for="item in drawerCountryOptions"
-                  :value="item.value"
-                  :key="item.value"
-                  :label="item.label"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
             <el-form-item label="清单名称" prop="detailedListName" class="search-item" v-show="isListType">
               <el-input
                 v-model="sarAccessInfoSearch.detailedListName"
@@ -130,7 +115,11 @@
                 @click="clearSearchLaws">清空</el-button>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn">
+              <el-button type="primary" v-if="showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
+                <i class="iconfont">&#xe7a5;</i>
+                高级查询
+              </el-button>
+              <el-button type="primary" v-if="!showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
                 <i class="iconfont">&#xe7a5;</i>
                 高级查询
               </el-button>
@@ -138,6 +127,58 @@
           </el-form>
         </div>
       </div>
+      <div class="showSelectBox" v-if="!showSelectBox">
+        <el-form  :model="sarAccessInfoSearch" class="label-input-form" label-width="70px" v-if="!disabledFlag" inline>
+          <el-form-item label="文本状态"  v-show="!isListType">
+            <el-select
+              v-model="sarAccessInfoSearch.textStatus"
+              placeholder="请选择"
+              filterable
+              size="small"
+            >
+              <el-option
+                v-for="item in textStatusOptions"
+                :value="item.value"
+                :key="item.value"
+                :label="item.label"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="发布日期"  v-show="!isListType">
+            <el-date-picker
+              v-model="sarAccessInfoSearch.issueTime"
+              type="date"
+              value-format="yyyy-MM-DD"
+              size="small"
+              placeholder="选择发布日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="项目名称"  v-show="isListType">
+            <el-input
+              size="small"
+              v-model="sarAccessInfoSearch.standSystem"
+              placeholder="请输入"
+              :maxlength="100"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="更新人"  v-show="isListType">
+            <el-input
+              v-model="sarAccessInfoSearch.standName"
+              placeholder="请输入"
+              :maxlength="100"
+              size="small"/>
+          </el-form-item>
+          <el-form-item label="更新时间"  v-show="isListType">
+            <el-date-picker
+              v-model="sarAccessInfoSearch.modifyTime"
+              type="date"
+              size="small"
+              value-format="yyyy-MM-DD"
+              placeholder="选择更新日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-form>
+      </div>
       <div class="action-bar">
         <el-button
           class="common-button-default"
@@ -326,18 +367,12 @@
           align="center"
           width="180px"
           label="适用车型">
-          <template slot-scope="scope">
-            <span>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
-          </template>
         </el-table-column>
         <el-table-column
           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="putTime"
@@ -373,9 +408,6 @@
           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
@@ -383,9 +415,6 @@
           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
@@ -415,7 +444,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>
-        <el-table-column width="150" label="操作">
+        <el-table-column width="150" align="center" label="操作">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"
@@ -489,6 +518,7 @@ import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
 import stand from "../../../config/pages/attributeCustom/components/stand";
 import { mapGetters } from 'vuex'
 import {interfaceUrl} from "@/sysConfig";
+import {dicTypeData} from "@/api/unqualProcess";
 export default {
   name: 'OtherAddEit',
   components: {
@@ -512,32 +542,12 @@ export default {
     CustomRoleTree
   },
   data () {
-    // let validatePass = (rule, value, callback) => {
-    //   let list = []
-    //   //sarAccessInfoListADMIN  可能不存在
-    //   if (this.sarAccessInfoListADMIN.length > 0) {
-    //     for (let a  = 0; a < this.sarAccessInfoListADMIN.length;a++) {
-    //       list.push(this.sarAccessInfoListADMIN[a].code)
-    //     }
-    //   }
-    //   if (this.sarAccessInfoList.length > 0) {
-    //     for (let b = 0; b < this.sarAccessInfoList.length;b++) {
-    //       list.push(this.sarAccessInfoList[b].code)
-    //     }
-    //   }
-    //   for (let c = 0; c < list.length; c++) {
-    //     if (value === list[c]) {
-    //       callback(new Error('此标准号已存在'))
-    //     }
-    //   }
-    // }
     return {
       textStatusMap: {},
       typeApplicableMap: {},
       nylxMap: {},
       zrbmMap: {},
       sycpxMap: {},
-      zrbmOptions: [],
       selectSearch : [],
       // 新增、编辑 基础信息字段
       sarAccessEO: {
@@ -569,15 +579,21 @@ export default {
         ]
       },
       disabledFlag: false,
+      /** ****************************/
+      zrbmOptions: [], // 责任部门
+      categoryOptions: [], // 能源类型
+      energyKindOptions: [], // 能源种类list
+      sycpxOptions: [], // 适用产品线
+      applyArcticOptions: [], // 基础车型 适用车型list
+      /** ******************************/
       regionOptions: [], // 基础信息 区域list
       drawerCountryOptions: [], // 基础信息 国家list
       applyOptions: [], //基础信息适用领域list
-      applyArcticOptions: [], // 基础车型 适用车型list
-      energyKindOptions: [], // 能源种类list
       accessSarTypeOptions: [], // 要求类型list
       standSortOptions: [], // 标准类别
       standStateOptions: [], // 标准状态
       GXHBQOptions: [], // 标签list
+      textStatusOptions: [], // 文本状态
       askNatureOptions: [], // 监管类型list
       ROLELIST: [], // 项目评估角色
       // 数据搜索 数据来源list
@@ -605,6 +621,7 @@ export default {
       },
       moreSearchBtn: true, // 多属性搜索按钮 状态
       showTableFlag: true, // 显示添加列表 状态
+      showSelectBox: true, // 显示高级查询 状态
       sarAccessInfoSearchList: [], // 数据搜索 table列表数据
       importmodalFlag: false, // 导入model 状态
       searching: false,
@@ -815,9 +832,26 @@ export default {
       uuid: '',
     }
   },
+  created() {
+    this.selectLawsStands()
+    dicTypeData().then(res => {
+      // 责任部门数据字典
+      this.zrbmOptions = res.data.ZRBMCLASS
+      // 能源类型数据字典
+      this.energyKindOptions = res.data.ENERGYTYPES
+      // this.categoryOptions = res.data.NYLXCLASS // 能源类型
+      // 适用车型数据字典
+      this.applyArcticOptions = res.data.PRODUCTTYPE
+      // 适用产品线数据字典
+      this.sycpxOptions = res.data.SYCPXCLASS
+    })
+  },
   methods: {
     // 高级检索
     selectMoreBtn () {
+      this.showSelectBox = !this.showSelectBox
+      this.showTableFlag = false
+      this.selectLawsStands()
     },
     // 法规维护人树
     getDept () {
@@ -1242,19 +1276,7 @@ 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)
+        this.drawerTotal = res.data.list.length
       }, e => {
 
       })
@@ -1266,7 +1288,68 @@ export default {
     // 数据搜索 table select事件
     sarAccessInfoSearchSelect (val) {
       this.selectedAccInfoSearchList = val
-      console.log(val)
+      this.selectedAccInfoSearchList.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)
+      })
+      this.selectedAccInfoSearchList.forEach(item => {
+        // 责任部门转换
+        if (item.zrbm !== null || item.zrbm !== "") {
+          let k = (item.zrbm || "").split(',')
+          for (let i in this.zrbmOptions) {
+            for (let m = 0; m< k.length; m++) {
+              if (this.zrbmOptions[i].value === k[m]) {
+                k[m]  = this.zrbmOptions[i].label
+              }
+              item.zrbm = k.join(',')
+            }
+          }
+        }
+        // 能源类型转换
+        if (item.nylx !== null) {
+          let k = (item.nylx || "").split(',')
+          for (let i in this.categoryOptions) {
+            for (let m = 0; m< k.length; m++) {
+              if (this.categoryOptions[i].value === k[m]) {
+                k[m]  = this.categoryOptions[i].label
+              }
+              item.nylx = k.join(',')
+            }
+          }
+        }
+        // 适用车型转换
+        if (item.typeApplicable !== null) {
+          let k = (item.typeApplicable || "").split(',')
+          for (let i in this.energyKindOptions) {
+            for (let m = 0; m< k.length; m++) {
+              if (this.energyKindOptions[i].value === k[m]) {
+                k[m]  = this.energyKindOptions[i].label
+              }
+              item.typeApplicable = k.join(',')
+            }
+          }
+        }
+        // s适用产品线转换
+        if (item.sycpx !== null) {
+          let k = (item.sycpx || "").split(',')
+          for (let i in this.sycpxOptions) {
+            for (let m = 0; m< k.length; m++) {
+              if (this.sycpxOptions[i].value === k[m]) {
+                k[m]  = this.sycpxOptions[i].label
+              }
+              item.sycpx = k.join(',')
+            }
+          }
+        }
+      })
     },
     // 数据搜索 清单类型 table select事件
     accessSarTypeSelect (selectData) {

From 2064a18ced91483f8fffcc57b99af1b5e2ee0787 Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Sat, 24 Jul 2021 16:56:28 +0800
Subject: [PATCH 4/5] =?UTF-8?q?bug:=20=E5=9B=BD=E5=86=85=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8F=90=E4=BA=A4=E5=90=8E=EF=BC=8C=E5=AE=9E?=
 =?UTF-8?q?=E6=96=BD=E6=97=A5=E6=9C=9F=E9=83=BD=E5=8F=98=E6=88=90=E4=BA=86?=
 =?UTF-8?q?1910-01-01=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue                | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index b7a97c8e7..6c2fae52d 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -2281,6 +2281,7 @@ export default {
     },
     // 编辑标准属性
     selectStandardPro (item, state) {
+      debugger
       this.id = item.id
       this.collectId = item.collectId
       this.addOrUPdateFlag = 2
@@ -3096,6 +3097,7 @@ export default {
     },
     // 保存或修改标准
     saveOrUpdateStands () {
+      debugger
       this.isSubmit = true
       this.$refs['sarStandardsInfoForm'].validate((valid) => {
         if (valid) {
@@ -3122,7 +3124,7 @@ export default {
                 const value = nowstandinfo[item.attrField]
                 // 时间格式处理
                 if (item.attrType === 'DATE_PICKER' && value) {
-                  nowstandinfo[item.attrField] = this.$dateFormat(this.sarStandardsInfoEO[item.attrField], 'yyyy-MM-dd hh:mm:ss')
+                  nowstandinfo[item.attrField] = this.sarStandardsInfoEO[item.attrField]
                 }
                 // 数组处理
                 if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') {
@@ -3133,6 +3135,7 @@ export default {
                 sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField]
               })
               nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
+              console.log(nowstandinfo, '提交参数')
               this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, {
                 _this: this
               }, res => {

From 34c72c698943a9b98a995c7291e9f952ece4b5fe Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Sat, 24 Jul 2021 16:58:29 +0800
Subject: [PATCH 5/5] bug

---
 .../domesticStandardsAndRegulations/index.vue                   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 6c2fae52d..8deefea47 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -2281,7 +2281,6 @@ export default {
     },
     // 编辑标准属性
     selectStandardPro (item, state) {
-      debugger
       this.id = item.id
       this.collectId = item.collectId
       this.addOrUPdateFlag = 2
@@ -3097,7 +3096,6 @@ export default {
     },
     // 保存或修改标准
     saveOrUpdateStands () {
-      debugger
       this.isSubmit = true
       this.$refs['sarStandardsInfoForm'].validate((valid) => {
         if (valid) {