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

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

@@ -459,14 +459,15 @@ export default {
     },
     // 根据准入id查询标准法规详情
     selectInfobyAccid() {
+      if(this.sarAccessEO.sortKey === '1'){
         this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
           ...this.standardFormList,
           ...this.standardForm,
-        id: this.pageId
+          id: this.pageId,
+          types: '1',
         }, {
           _this: this
         }, res => {
-        console.log(res.data.records);
           res.data.records.forEach(item => {
             if (item.nylx === "[]") {
               item.nylx = null;
@@ -492,6 +493,40 @@ export default {
           });
         }, e => {
         });
+      }else{
+        this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
+          ...this.standardFormList,
+          ...this.standardForm,
+          id: this.pageId
+        }, {
+          _this: this
+        }, res => {
+          res.data.records.forEach(item => {
+            if (item.nylx === "[]") {
+              item.nylx = null;
+            }
+            if (item.typeApplicable === "[]") {
+              item.typeApplicable = null;
+            }
+            if (item.sycpx === "[]") {
+              item.sycpx = null;
+            }
+            if(item.zrbm === "[]"){
+              item.zrbm = null
+            }
+          });
+          this.standinfoList = res.data.records;
+          this.standardFormTotal = res.data.total;
+          this.standinfoList.forEach(item => {
+            if (item.standYear === null) {
+              item.standNumber = item.standSortShow + " " + item.standNumber;
+            } else {
+              item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear;
+            }
+          });
+        }, e => {
+        });
+      }
     },
     selectInfoMore() {
       this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {