Merge remote-tracking branch 'origin/develop' into develop

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;

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",