From 14df0db27e1cf69f31e016d882e1e9b0d2c2972e Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Wed, 5 Jan 2022 16:11:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=BA=93=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=8C=E6=B8=85=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accessStandardsAndRegulations/pages/details.vue      | 9 +++++++++
 .../domesticStandardsAndRegulations/index.vue            | 9 +++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index ffd3b9d75..c841652f3 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -483,6 +483,15 @@ export default {
             if(item.zrbm === "[]"){
               item.zrbm = null
             }
+            if (item.zccssrqgj === "undefined") {
+              item.zccssrqgj = '-'
+            }
+            if (item.xcxssrqgj === "undefined") {
+              item.xcxssrqgj = '-'
+            }
+            if (item.ssrq === "undefined") {
+              item.ssrq = '-'
+            }
           });
           this.standinfoList = res.data.records;
           this.standardFormTotal = res.data.total;
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 0a7ae0d29..65b7a2020 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -3626,6 +3626,7 @@ export default {
     selectMoreBtn() {
       this.isAdvancedSearch = true
       this.sarStandardsSearch = {}
+      console.log(this.sarStandardsSearch)
     },
     treeCollapse() {
       this.sideClose = !this.sideClose
@@ -4278,7 +4279,8 @@ export default {
         this.sarStandardsSearch.page = page
       }
       this.standCommonlySearch.page = page
-      if (this.sarStandardsSearch) {
+      this.standCommonlySearch.pageNo = 1
+      if (this.sarStandardsSearch.standNumber !== '' || this.sarStandardsSearch.standName !== '') {
         this.getDomesticStandardTable(this.sarStandardsSearch)
       } else {
         this.getDomesticStandardTable(this.standCommonlySearch)
@@ -4294,7 +4296,6 @@ export default {
     },
     // 分页查询国内标准
     getDomesticStandardTable(item) {
-      console.log('4292',item)
       if (item !== '' && item !== null && item !== undefined) {
         item.pageSize = this.$store.getters.userInfo.configContent
       }
@@ -4305,7 +4306,6 @@ export default {
       }
       // this.sarStandardsSearch.menuId = this.selectSarMenu.id
       const formData = {...data}
-      console.log(formData)
       if (!item) {
         formData.menuId = this.sarStandardsSearch.menuId
       } else {
@@ -4335,11 +4335,8 @@ export default {
       // // 自定义属性字段高级搜索处理
       //advanceSearchVOStr
       const advanceSearchVOList = [];
-      console.log('4333',this.advanceSearchMapping)
       for (let key in this.advanceSearchMapping) {
-        console.log('key',key)
         const value = this.advanceSearchMapping[key];
-        console.log('value',value)
         if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX&&item.CLLX.length>0)) ){
           advanceSearchVOList.push({
             connect: "and",