From a54fdcc61a8c5f238f8c3a653fb47b026f0105da Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Tue, 27 Jul 2021 17:49:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91=E9=A1=B5?=
 =?UTF-8?q?=E7=9A=84=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/listOfCountries.vue                  |  10 -
 .../pages/addEdit.vue                         | 165 +++++++---
 .../pages/otherAddEit.vue                     | 294 ++++++++++++++---
 .../pages/projectAddEit.vue                   | 302 +++++++++++++++---
 4 files changed, 620 insertions(+), 151 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index 60757cd0d..960328388 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -117,16 +117,6 @@
               }}</span>
           </template>
         </el-table-column>
-<!--        <el-table-column
-          prop="applicationScope"
-          label="适用领域"
-          align="center">
-          <template slot-scope="scope">
-            <span
-              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
-              }}</span>
-          </template>
-        </el-table-column>-->
         <el-table-column
           prop="updateTime"
           label="更新时间"
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index f001bac6b..9e4990191 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -1168,19 +1168,19 @@ export default {
         this.selectedAccInfoSearchList.map(item => {
           let addList;
           addList = this.sarAccessInfoList.findIndex(items => {
-            return items.id == item.id
-          })
+              return items.id == item.id
+            })
           if(addList > -1){
-            this.$message.warning('请勿添加重复数据')
-            this.$refs.accessTypeSelect.clearSelection()
-            this.$refs.entryTable.clearSelection()
-            this.$refs.searchTable.clearSelection()
-          } else{
-            this.sarAccessInfoList.push(item)
-            this.$refs.accessTypeSelect.clearSelection()
-            this.$refs.entryTable.clearSelection()
-            this.$refs.searchTable.clearSelection()
-          }
+              this.$message.warning('请勿添加重复数据')
+              // this.$refs.accessTypeSelect.clearSelection()
+              this.$refs.entryTable.clearSelection()
+              this.$refs.searchTable.clearSelection()
+            } else{
+              this.sarAccessInfoList.push(item)
+              // this.$refs.accessTypeSelect.clearSelection()
+              this.$refs.entryTable.clearSelection()
+              this.$refs.searchTable.clearSelection()
+            }
         })
       } else {
         this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
@@ -1329,12 +1329,16 @@ export default {
               _this: this,
               loading: 'loadData'
             }, res => {
-              if (res.ok) {
-                this.$message.success('新增成功')
-                this.isNext = true
-                this.$router.push({
-                  name: 'AccessStandardsAndRegulations'
-                })
+              if (this.sarAccessInfoList.length !== 0) {
+                if (res.ok) {
+                  this.$message.success('新增成功')
+                  this.isNext = true
+                  this.$router.push({
+                    name: 'AccessStandardsAndRegulations'
+                  })
+                }
+              } else {
+                this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
               }
             }, e => {
             })
@@ -1363,6 +1367,7 @@ export default {
     selectLawsStands () {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+        this.sarAccessInfoSearch.standType = ''
       } else {
         this.sarAccessInfoSearch.standType = 'FOREIGN'
       }
@@ -1374,16 +1379,29 @@ export default {
           } else {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
-          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)
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            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 => {
@@ -1403,16 +1421,29 @@ export default {
           } else {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
-          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)
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            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 => {
@@ -1426,16 +1457,29 @@ export default {
     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)
+        if (item.attrInfoMap === null) {
+          this.$set(item, 'zccssrqgj', '')
+          this.$set(item, 'xcxssrqgj', '')
+          this.$set(item, 'sycpx', '')
+          this.$set(item, 'typeApplicable', '')
+          this.$set(item, 'nylx', '')
+          this.$set(item, 'zrbm', '')
+          this.$set(item, 'cycvppsbm', '')
+          this.$set(item, 'cycvppscn', '')
+          this.$set(item, 'kccvppsbm', '')
+          this.$set(item, 'kccvppscn', '')
+        }else {
+          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 => {
         // 责任部门转换
@@ -1947,6 +1991,29 @@ export default {
           } else {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            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)
+          }
         })
       }, e => {
       })
@@ -2020,8 +2087,8 @@ export default {
         this.sarAccessEO.remark = accessRow.remark || ''
         this.sarAccessEO.relateFile = accessRow.relateFile
         this.sarAccessInfoSearch.validFlag = 0
-        this.getFileInfo()
         this.getData()
+        this.getFileInfo()
         this.selectLawsStands()
       })
     } else {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 08ec91a6c..2cdf4cc02 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -346,7 +346,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>
-        <el-table-column width="150" align="center" label="操作">
+        <el-table-column width="240" align="center" label="操作">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"
@@ -360,6 +360,12 @@
               size="small" @click="moveDown(scope.$index, scope.row)"
               v-if="!disabledFlag"
             >下移</el-button>
+            <el-button
+              size="small"
+              @click="editTghisRow(scope.row)"
+              class="common-button-default"
+              type="warning"
+            >编辑</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -396,6 +402,90 @@
         </div>
       </el-upload>
     </el-dialog>
+    <!--编辑-->
+    <el-drawer
+      title="编辑清单条目"
+      :visible.sync="drawerEdit"
+      :wrapperClosable="false"
+      size="800px"
+    >
+      <el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
+        <el-form-item label="标准号">
+          <el-input  v-model.trim="editRowData.standNumber"  :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="标准名称" prop="standName">
+          <el-input v-model.trim="editRowData.standName" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="英文名称" prop="standEnName">
+          <el-input v-model.trim="editRowData.standEnName" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="适用车型" prop="typeApplicable">
+          <el-input v-model.trim="editRowData.typeApplicable" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="能源类型" prop="nylx">
+          <el-input v-model.trim="editRowData.nylx" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="标准实施日期" prop="putTime">
+          <el-date-picker
+            v-model.trim="editRowData.putTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="在产车实施日期" prop="zccssrqgj">
+          <el-date-picker
+            v-model.trim="editRowData.zccssrqgj"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="新车型实施日期" prop="xcxssrqgj">
+          <el-date-picker
+            v-model.trim="editRowData.xcxssrqgj"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="责任部门" prop="zrbm">
+          <el-input v-model.trim="editRowData.zrbm" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="适用产品线" prop="sycpx">
+          <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
+          <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
+          <el-input v-model.trim="editRowData.cycvppscn" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="卡车VPPS编码" prop="kccvppsbm">
+          <el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
+          <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
+        </el-form-item>
+      </el-form>
+      <div class="demo-drawer-footer">
+        <el-button
+          type="primary"
+          class="common-button-primary"
+          size="mini"
+          icon="el-icon-check"
+          @click="saveInfo"
+        >提交</el-button
+        >
+        <el-button
+          size="mini"
+          icon="el-icon-close"
+          class="common-button-default"
+          @click="cancelInfo"
+        >取消</el-button
+        >
+      </div>
+    </el-drawer>
   </div>
 </template>
 <script>
@@ -451,6 +541,26 @@ export default {
       zrbmMap: {},
       sycpxMap: {},
       selectSearch : [],
+      // 编辑抽屉状态
+      drawerEdit: false,
+      // 编辑框数据
+      editRowData: {
+        id: '',
+        standName: '',
+        standSortShow:'',
+        standEnName: '',
+        typeApplicable: '',
+        nylx: '',
+        putTime: '',
+        zccssrqgj: '',
+        xcxssrqgj: '',
+        zrbm: '',
+        sycpx: '',
+        cycvppsbm: '',
+        cycvppscn: '',
+        kccvppsbm: '',
+        kccvppscn: ''
+      },
       // 新增、编辑 基础信息字段
       sarAccessEO: {
         id: '',
@@ -1022,17 +1132,18 @@ export default {
         // 追加字段
         this.selectedAccInfoSearchList.map(item => {
           let addList;
+
           addList = this.sarAccessInfoList.findIndex(items => {
-            return items.id == item.id
-          })
+              return items.id == item.id
+            })
           if(addList > -1){
             this.$message.warning('请勿添加重复数据')
-            this.$refs.accessTypeSelect.clearSelection()
+            // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
           } else{
             this.sarAccessInfoList.push(item)
-            this.$refs.accessTypeSelect.clearSelection()
+            // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
           }
@@ -1069,6 +1180,22 @@ export default {
         this.$set(this.sarAccessInfoList, index, i)
       }
     },
+    // 编辑按钮
+    editTghisRow(row) {
+      this.rowList = row
+      this.editRowData = this.rowList
+      this.editRowData.standNumber = this.rowList.standNumber
+      this.drawerEdit = true
+    },
+    // 抽屉取消按钮
+    cancelInfo() {
+      this.drawerEdit = false
+    },
+    // 抽屉提交按钮
+    saveInfo() {
+      this.rowList = this.editRowData
+      this.drawerEdit = false
+    },
     // 点击清单条目导入按钮事件
     importmodalFlags () {
       this.importmodalFlag = true
@@ -1126,12 +1253,30 @@ export default {
       this.$refs['sarAccessForm'].validate((valid) => {
         if (valid) {
           let rowlist = []
+          let rowlist1 = []
+          let rowlist2 = []
+          let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
+            if (this.sarAccessInfoList[i].putTime === null || this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === null)  {
+              rowlist1.push(this.sarAccessInfoList[i].putTime)
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
+            }else {
+              rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
+            }
           }
           rowlist = rowlist.join(',')
+          rowlist1 = rowlist1.join(',')
+          rowlist2 = rowlist2.join(',')
+          rowlist3 = rowlist3.join(',')
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.inforlist = JSON.stringify(rowlist)
+          sarAccessEO.inforlist1 = JSON.stringify(rowlist1)
+          sarAccessEO.inforlist2 = JSON.stringify(rowlist2)
+          sarAccessEO.inforlist3 = JSON.stringify(rowlist3)
           // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
           // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
           // 判断是否有附件
@@ -1150,12 +1295,16 @@ export default {
               _this: this,
               loading: 'loadData'
             }, res => {
-              if (res.ok) {
-                this.$message.success('新增成功')
-                this.isNext = true
-                this.$router.push({
-                  name: 'AccessStandardsAndRegulations'
-                })
+              if (this.sarAccessInfoList.length !== 0) {
+                if (res.ok) {
+                  this.$message.success('新增成功')
+                  this.isNext = true
+                  this.$router.push({
+                    name: 'AccessStandardsAndRegulations'
+                  })
+                }
+              }else {
+                this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
               }
             }, e => {
             })
@@ -1184,6 +1333,7 @@ export default {
     selectLawsStands () {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+        this.sarAccessInfoSearch.standType = ''
       } else {
         this.sarAccessInfoSearch.standType = 'FOREIGN'
       }
@@ -1195,16 +1345,29 @@ export default {
           } else {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
-          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)
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            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 => {
@@ -1225,16 +1388,29 @@ export default {
           } else {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
-          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)
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            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 => {
@@ -1248,16 +1424,29 @@ export default {
     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)
+        if (item.attrInfoMap === null) {
+          this.$set(item, 'zccssrqgj', '')
+          this.$set(item, 'xcxssrqgj', '')
+          this.$set(item, 'sycpx', '')
+          this.$set(item, 'typeApplicable', '')
+          this.$set(item, 'nylx', '')
+          this.$set(item, 'zrbm', '')
+          this.$set(item, 'cycvppsbm', '')
+          this.$set(item, 'cycvppscn', '')
+          this.$set(item, 'kccvppsbm', '')
+          this.$set(item, 'kccvppscn', '')
+        }else {
+          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 => {
         // 责任部门转换
@@ -1771,6 +1960,29 @@ export default {
           } else {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            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)
+          }
         })
       }, e => {
 
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index a784e604c..7e4a2ff4b 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -346,7 +346,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>
-        <el-table-column width="150" align="center" label="操作">
+        <el-table-column width="240" align="center" label="操作">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"
@@ -360,6 +360,12 @@
               size="small" @click="moveDown(scope.$index, scope.row)"
               v-if="!disabledFlag"
             >下移</el-button>
+            <el-button
+              size="small"
+              @click="editTghisRow(scope.row)"
+              class="common-button-default"
+              type="warning"
+            >编辑</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -396,6 +402,89 @@
         </div>
       </el-upload>
     </el-dialog>
+    <el-drawer
+      title="编辑清单条目"
+      :visible.sync="drawerEdit"
+      :wrapperClosable="false"
+      size="800px"
+    >
+      <el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
+        <el-form-item label="标准号">
+          <el-input  v-model.trim="editRowData.standNumber"  :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="标准名称" prop="standName">
+          <el-input v-model.trim="editRowData.standName" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="英文名称" prop="standEnName">
+          <el-input v-model.trim="editRowData.standEnName" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="适用车型" prop="typeApplicable">
+          <el-input v-model.trim="editRowData.typeApplicable" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="能源类型" prop="nylx">
+          <el-input v-model.trim="editRowData.nylx" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="标准实施日期" prop="putTime">
+          <el-date-picker
+            v-model.trim="editRowData.putTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="在产车实施日期" prop="zccssrqgj">
+          <el-date-picker
+            v-model.trim="editRowData.zccssrqgj"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="新车型实施日期" prop="xcxssrqgj">
+          <el-date-picker
+            v-model.trim="editRowData.xcxssrqgj"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="责任部门" prop="zrbm">
+          <el-input v-model.trim="editRowData.zrbm" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="适用产品线" prop="sycpx">
+          <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
+          <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
+          <el-input v-model.trim="editRowData.cycvppscn" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="卡车VPPS编码" prop="kccvppsbm">
+          <el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
+          <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
+        </el-form-item>
+      </el-form>
+      <div class="demo-drawer-footer">
+        <el-button
+          type="primary"
+          class="common-button-primary"
+          size="mini"
+          icon="el-icon-check"
+          @click="saveInfo"
+        >提交</el-button
+        >
+        <el-button
+          size="mini"
+          icon="el-icon-close"
+          class="common-button-default"
+          @click="cancelInfo"
+        >取消</el-button
+        >
+      </div>
+    </el-drawer>
   </div>
 </template>
 <script>
@@ -466,6 +555,26 @@ export default {
       },
       fileInfoList: [], // 上传的附件
       uploadFileListPath: 'api/att/attFile/upload', // 上传的地址
+      // 编辑抽屉状态
+      drawerEdit: false,
+      // 编辑框数据
+      editRowData: {
+        id: '',
+        standName: '',
+        standSortShow:'',
+        standEnName: '',
+        typeApplicable: '',
+        nylx: '',
+        putTime: '',
+        zccssrqgj: '',
+        xcxssrqgj: '',
+        zrbm: '',
+        sycpx: '',
+        cycvppsbm: '',
+        cycvppscn: '',
+        kccvppsbm: '',
+        kccvppscn: ''
+      },
       // 新增、编辑 基础信息验证条件
       sarAccessEORules: {
         type: [
@@ -1024,16 +1133,16 @@ export default {
         this.selectedAccInfoSearchList.map(item => {
           let addList;
           addList = this.sarAccessInfoList.findIndex(items => {
-            return items.id == item.id
-          })
+              return items.id == item.id
+            })
           if(addList > -1){
             this.$message.warning('请勿添加重复数据')
-            this.$refs.accessTypeSelect.clearSelection()
+            // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
           } else{
             this.sarAccessInfoList.push(item)
-            this.$refs.accessTypeSelect.clearSelection()
+            // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
           }
@@ -1070,6 +1179,22 @@ export default {
         this.$set(this.sarAccessInfoList, index, i)
       }
     },
+    // 编辑按钮
+    editTghisRow(row) {
+      this.rowList = row
+      this.editRowData = this.rowList
+      this.editRowData.standNumber = this.rowList.standNumber
+      this.drawerEdit = true
+    },
+    // 抽屉取消按钮
+    cancelInfo() {
+      this.drawerEdit = false
+    },
+    // 抽屉提交按钮
+    saveInfo() {
+      this.rowList = this.editRowData
+      this.drawerEdit = false
+    },
     // 点击清单条目导入按钮事件
     importmodalFlags () {
       this.importmodalFlag = true
@@ -1127,12 +1252,30 @@ export default {
       this.$refs['sarAccessForm'].validate((valid) => {
         if (valid) {
           let rowlist = []
+          let rowlist1 = []
+          let rowlist2 = []
+          let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
+            if (this.sarAccessInfoList[i].putTime === null || this.sarAccessInfoList[i].zccssrqgj ===null || this.sarAccessInfoList[i].xcxssrqgj === null)  {
+              rowlist1.push(this.sarAccessInfoList[i].putTime)
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
+            }else {
+              rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
+            }
           }
           rowlist = rowlist.join(',')
+          rowlist1 = rowlist1.join(',')
+          rowlist2 = rowlist2.join(',')
+          rowlist3 = rowlist3.join(',')
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.inforlist = JSON.stringify(rowlist)
+          sarAccessEO.inforlist1 = JSON.stringify(rowlist1)
+          sarAccessEO.inforlist2 = JSON.stringify(rowlist2)
+          sarAccessEO.inforlist3 = JSON.stringify(rowlist3)
           // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
           // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
           // 判断是否有附件
@@ -1151,12 +1294,16 @@ export default {
               _this: this,
               loading: 'loadData'
             }, res => {
-              if (res.ok) {
-                this.$message.success('新增成功')
-                this.isNext = true
-                this.$router.push({
-                  name: 'AccessStandardsAndRegulations'
-                })
+              if (this.sarAccessInfoList.length !== 0) {
+                if (res.ok) {
+                  this.$message.success('新增成功')
+                  this.isNext = true
+                  this.$router.push({
+                    name: 'AccessStandardsAndRegulations'
+                  })
+                }
+              }else {
+                this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
               }
             }, e => {
             })
@@ -1185,6 +1332,7 @@ export default {
     selectLawsStands () {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+        this.sarAccessInfoSearch.standType = ''
       } else {
         this.sarAccessInfoSearch.standType = 'FOREIGN'
       }
@@ -1196,16 +1344,29 @@ export default {
           } else {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
-          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)
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            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 => {
@@ -1226,16 +1387,29 @@ export default {
           } else {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
-          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)
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            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 => {
@@ -1249,16 +1423,29 @@ export default {
     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)
+        if (item.attrInfoMap === null) {
+          this.$set(item, 'zccssrqgj', '')
+          this.$set(item, 'xcxssrqgj', '')
+          this.$set(item, 'sycpx', '')
+          this.$set(item, 'typeApplicable', '')
+          this.$set(item, 'nylx', '')
+          this.$set(item, 'zrbm', '')
+          this.$set(item, 'cycvppsbm', '')
+          this.$set(item, 'cycvppscn', '')
+          this.$set(item, 'kccvppsbm', '')
+          this.$set(item, 'kccvppscn', '')
+        }else {
+          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 => {
         // 责任部门转换
@@ -1776,16 +1963,29 @@ export default {
           }
         })
         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)
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            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)
+          }
         })
       }, e => {