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

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

@@ -462,6 +462,7 @@ export default {
         }, {
           _this: this
         }, res => {
+          if (res.data !== null) {
             res.data.records.forEach(item => {
               if (item.nylx === "[]") {
                 item.nylx = null;
@@ -495,6 +496,10 @@ export default {
               }
             });
             this.standInfoTableLoading = false
+          } else {
+            this.standinfoList = []
+          }
+
         }, e => {
           this.standInfoTableLoading = false
         });
@@ -506,6 +511,7 @@ export default {
         }, {
           _this: this
         }, res => {
+          if (res.data !== null) {
             res.data.records.forEach(item => {
               if (item.nylx === "[]") {
                 item.nylx = null;
@@ -530,6 +536,10 @@ export default {
               }
             });
             this.standInfoTableLoading = false
+          } else {
+            this.standinfoList = []
+          }
+
         }, e => {
           this.standInfoTableLoading = false
         });
@@ -773,13 +783,17 @@ export default {
      * 高级检索
      */
     selectMoreBtn() {
-      this.isAdvancedSearch = true;
+      this.standardForm.zrbm = ''
+      this.standardForm.responseUnit = ''
+      this.standardForm.standName = ''
+      this.standardForm.standNumber = ''
       this.standardFormList.standName = "";
       this.standardFormList.typeApplicable = "";
       this.standardFormList.nylx = "";
       this.standardFormList.zrbm = "";
       this.standardFormList.sycpx = "";
       this.showTableFlag = false;
+      this.isAdvancedSearch = true;
       this.page = 1;
       this.standardForm.page = 1;
       this.selectInfoMore();

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -4,7 +4,7 @@
     <div class="search-area">
       <div class="left">
         <el-form inline :model="localProTableSearch" class="label-input-form"
-                 @keyup.enter.native="getLocalProductTableBtn">
+                 @keyup.enter.native="getLocalProductTableBtns">
           <el-form-item label="项目编号" class="search-item">
             <el-input
               v-model="localProTableSearch.projectNumber"
@@ -51,7 +51,7 @@
               class="common-button-primary"
               size="small"
               v-btn-permission="'b1ac4fb12eeb08c525b018ef839dbd40'"
-              @click="getLocalProductTableBtn">查询
+              @click="getLocalProductTableBtns">查询
             </el-button>
           </el-form-item>
           <el-form-item class="search-item btn-box">
@@ -477,7 +477,7 @@ export default {
         projectClassification: "",
         // 项目状态
         projectStatus: "",
-        page: ""
+        page: 1
       },
       //查询3类
       projectLibrarySearchDefault: {
@@ -1210,6 +1210,37 @@ export default {
       this.SarExportSearchEo = this.localProTableSearch;
       this.$http.get("sarStandProjectLibrary/queryProject", {
         ...this.localProTableSearch,
+        page: this.page,
+        pageSize: this.pageSize,
+      }, {
+        _this: this, loading: "loading"
+      }, res => {
+        if (this.localProTableSearch.prodectCode === "Maintenance") {
+          this.localProTableList = res.data.Maintenance.records;
+          this.productTypeOptions = this.projectData
+          this.xmztOptions = this.projectStatus
+          this.total = res.data.Maintenance.total;
+        } else if (this.localProTableSearch.prodectCode === "notMaintenance") {
+          this.localProTableList = res.data.notMaintenance.records;
+          this.productTypeOptions = this.notProjectData
+          this.xmztOptions = this.notProjectStatus
+          this.total = res.data.notMaintenance.total;
+        }
+      }, e => {
+      });
+      // this.$refs.selection.selectAll(false)
+    },
+
+    getLocalProductTableBtns() {
+      this.projectLibrarySearch.page = 1;
+      this.isAdvancedSearch = false;
+      this.getLocalProductTables();
+    },
+    getLocalProductTables() {
+      this.localProTableSearch.prodectCode = this.ifMaintaince;
+      this.localProTableSearch.dataType = this.insideTabsActiveName;
+      this.SarExportSearchEo = this.localProTableSearch;
+      this.$http.get("sarStandProjectLibrary/queryProject", {
         ...this.projectLibrarySearch,
         page: this.page,
         pageSize: this.pageSize,
@@ -1227,26 +1258,6 @@ export default {
           this.xmztOptions = this.notProjectStatus
           this.total = res.data.notMaintenance.total;
         }
-        // this.localProTableList.map((item) => {
-        //   this.xmztOptions.map((opr) => {
-        //     if (item.productBrand === opr.value) {
-        //       item.productBrand = opr.label
-        //     }
-        //   })
-        //   this.scxxOptions.map((xmItem) => {
-        //     if (item.saleMarket === xmItem.value) {
-        //       item.saleMarket = xmItem.label
-        //     }
-        //   })
-        //   this.scxxOptions.map((xmItem) => {
-        //     if (item.targetMarket === xmItem.value) {
-        //       item.targetMarket = xmItem.label
-        //     }
-        //   })
-        // })
-        // if ((this.localProTableList.length === 0 || this.localProTableList === []) && this.localProTableSearch.page !== 1) {
-        //   this.pageChange(1)
-        // }
       }, e => {
       });
       // this.$refs.selection.selectAll(false)

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -845,7 +845,9 @@ export default {
       // 查询详情表格数据
       this.$http.get('sarStandProjectLibrary/queryStandInfoNew', {
         id: this.localProEO.id,
-        cars: "1"
+        cars: "1",
+        current: 1,
+        pageSize: this.$store.getters.userInfo.configContent
       }, {
         _this: this,
         loading: 'loading'