From b26784d6d53b1c3a63152198874a567e32221c87 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Tue, 30 Nov 2021 14:51:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=9C=B0=E5=8C=BA=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E8=83=BD=E5=B8=A6=E5=85=A5=E6=8F=90=E4=BA=A4=E4=BC=81?=
 =?UTF-8?q?=E6=A0=87=E5=92=8C=E6=94=BF=E7=AD=96=E4=BA=86=EF=BC=88=E5=8F=AA?=
 =?UTF-8?q?=E6=98=AF=E8=83=BD=E5=B8=A6=E8=83=BD=E6=8F=90=E4=BA=A4=EF=BC=8C?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E7=9A=84=E9=9C=80=E6=B1=82=E6=88=91=E4=B8=8D?=
 =?UTF-8?q?=E7=9F=A5=E9=81=93=EF=BC=8C=E5=8F=91=E7=8E=B0=E4=BA=86=E5=86=8D?=
 =?UTF-8?q?=E5=8A=A0=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/addEdit.vue                          | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 708dc7532..8c06b1097 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -295,7 +295,7 @@
             align="center"
             label="标准号">
           <template slot-scope="scope">
-            <a @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
+            <a @click="handlePreview(scope.row)">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode }}</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -305,7 +305,7 @@
             width="260px"
         >
           <template slot-scope="scope">
-            <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
+            <a @click="handlePreview(scope.row)">{{ scope.row.standName || scope.row.lawsName }}</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -349,7 +349,7 @@
           <template slot-scope="scope">
             <span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
             </span>
-            <span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>
+<!--            <span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>-->
           </template>
         </el-table-column>
         <el-table-column
@@ -361,7 +361,7 @@
           <template slot-scope="scope">
             <span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
             </span>
-            <span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>
+<!--            <span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>-->
           </template>
         </el-table-column>
         <el-table-column
@@ -1267,6 +1267,7 @@ export default {
             this.$message.warning('请勿添加重复数据')
           } else {
             this.sarAccessInfoList.push(item)
+            console.log('1270',this.sarAccessInfoList)
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
@@ -1383,17 +1384,17 @@ export default {
           let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
-            if (this.sarAccessInfoList[i].ssrq === null) {
+            if (this.sarAccessInfoList[i].ssrq === null || this.sarAccessInfoList[i].ssrq === undefined) {
               rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
             } else {
               rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
             }
-            if (this.sarAccessInfoList[i].xcxssrqgj === null) {
+            if (this.sarAccessInfoList[i].xcxssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === undefined) {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
             } else {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
             }
-            if (this.sarAccessInfoList[i].zccssrqgj === null) {
+            if (this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].zccssrqgj === undefined) {
               rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
             } else {
               rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
@@ -1719,7 +1720,8 @@ export default {
     },
     // 数据搜索table判断checked状态
     selectable(row) {
-      return row.isRelateAccess === '1'
+      console.log('1723',row)
+      return row.isRelateAccess === '1' || row.isRelateAccess === undefined
     },
     // 数据搜索 table select事件
     sarAccessInfoSearchSelect(val) {