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

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -740,7 +740,7 @@ export default {
       this.standInfoTableLoading = true
       if(this.sarAccessEO.sortKey === '1'){
         this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
-          ...this.standardFormList,
+          ...this.sarAccessInfo,
           ...this.standardForm,
           id: this.pageId,
           types: '1',
@@ -762,13 +762,13 @@ export default {
                 item.zrbm = null
               }
               if (item.zccssrqgj === "undefined") {
-                item.zccssrqgj = '-'
+                item.zccssrqgj = ''
               }
               if (item.xcxssrqgj === "undefined") {
-                item.xcxssrqgj = '-'
+                item.xcxssrqgj = ''
               }
-              if (item.ssrq === "undefined") {
-                item.ssrq = '-'
+              if (item.ssrq === "undefined" || item.ssrq === 'null' || item.ssrq) {
+                item.ssrq = ''
               }
             });
             this.standinfoList = res.data.records;
@@ -791,7 +791,7 @@ export default {
         });
       }else{
         this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
-          ...this.standardFormList,
+          ...this.sarAccessInfo,
           ...this.standardForm,
           id: this.pageId
         }, {
@@ -833,7 +833,7 @@ export default {
     },
     selectInfoMore() {
       this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
-        ...this.standardFormList,
+        ...this.sarAccessInfo,
         id: this.pageId
       }, {
         _this: this
@@ -1077,7 +1077,7 @@ export default {
       this.showQueryMore = true;
       this.page = 1;
       this.standardForm.page = 1;
-      this.selectInfoMore();
+      // this.selectInfoMore();
     },
     queryInfo() {
       this.page = 1;
@@ -1086,11 +1086,11 @@ export default {
       this.isAdvancedSearch = false;
     },
     backInfo() {
-      this.standardFormList.standName = "";
-      this.standardFormList.typeApplicable = "";
-      this.standardFormList.nylx = "";
-      this.standardFormList.zrbm = "";
-      this.standardFormList.sycpx = "";
+      this.sarAccessInfo.standName = "";
+      this.sarAccessInfo.typeApplicable = "";
+      this.sarAccessInfo.nylx = "";
+      this.sarAccessInfo.zrbm = "";
+      this.sarAccessInfo.sycpx = "";
       this.isAdvancedSearch = false;
     },
     // 获取工作组信息下拉框信息