From 426db6f6ad22dd1ce5b2bbe6de75f7042995a49c Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Mon, 11 Apr 2022 15:56:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=20=E6=B5=B7=E5=A4=96?=
 =?UTF-8?q?=E5=BA=93=EF=BC=8C=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2=E4=B9=8B?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E7=82=B9=E5=87=BB=E4=B8=8B=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E9=A1=B5=E7=A0=81=EF=BC=8C=E4=BC=9A=E6=8A=8A=E7=9B=AE=E5=89=8D?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BA=93=E6=89=80=E6=9C=89=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=B1=95=E7=A4=BA=E5=87=BA=E6=9D=A5=EF=BC=88=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E6=A0=87=E5=87=86=E5=BA=93=E4=B9=9F=E8=BF=99=E6=A0=B7?=
 =?UTF-8?q?=E3=80=81=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E9=87=8C=E7=9A=84?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2=E4=B9=9F=E8=BF=99=E6=A0=B7?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreignStandardsAndRegulations/index.vue  | 31 ++++++++++++++++---
 .../localProductsOrProjectLibrary/index.vue   | 17 ++++++++--
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 62fa258af..7f2d602f4 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -1812,6 +1812,8 @@ export default {
   },
   data() {
     return {
+      seniorQuery: false, // 是否为高级查询
+      seniorQueryForm: {},
       // 人员树形和部门树形参数
       nodeList: [],
       nodeList2: [],
@@ -3146,6 +3148,13 @@ export default {
     },
     // 点击搜索按钮
     searchBtnClick() {
+      if (this.seniorQuery === true) {
+        this.standCommonlySearch.page = 1
+        this.seniorQuery = false
+      }
+      for (let key in this.sarStandardsSearch) {
+        this.sarStandardsSearch[key] = ''
+      }
       this.getDomesticStandardTable()
     },
     // 搜索
@@ -3190,6 +3199,8 @@ export default {
       item.page = 1
       this.standCommonlySearch.page = 1
       this.standCommonlySearch.sarStandardsSearch = JSON.stringify(item) || ''
+      this.seniorQuery = true
+      this.seniorQueryForm = item
       this.getDomesticStandardTable(item)
     },
     // 清空搜索框
@@ -3883,13 +3894,23 @@ export default {
     // 分页点击后方法
     pageChange(page) {
       this.standCommonlySearch.page = page
-      this.getDomesticStandardTable()
+      if (this.seniorQuery === false) {
+        this.getDomesticStandardTable()
+      } else {
+        this.seniorQueryForm.page = page
+        this.getDomesticStandardTable(this.seniorQueryForm)
+      }
     },
     // 分页每页显示数改变后方法
     pageSizeChange(pageSize) {
       this.standCommonlySearch.pageSize = pageSize
       this.standCommonlySearch.page = 1
-      this.getDomesticStandardTable()
+      if (this.seniorQuery === false) {
+        this.getDomesticStandardTable()
+      } else {
+        this.seniorQueryForm.page = page
+        this.getDomesticStandardTable(this.seniorQueryForm)
+      }
     },
     /**
      * // 分页查询标准
@@ -4031,9 +4052,9 @@ export default {
         this.advanceSearchMapping[key] = ''
       }
       //情况基本字段
-      for (let key in this.sarStandardsSearch) {
-        this.sarStandardsSearch[key] = ''
-      }
+      // for (let key in this.sarStandardsSearch) {
+      //   this.sarStandardsSearch[key] = ''
+      // }
     },
     // 查询处于游离态的标准
     selectConfiguraStand() {
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index 9bdd9ccad..7dd6c03b5 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -932,6 +932,7 @@ export default {
     },
     // 切换tabs
     handleClick(tab, event) {
+      this.page = 1
       this.localProEO.prodectCode = this.ifMaintaince;
       this.insideHandleClick();
     },
@@ -1203,8 +1204,9 @@ export default {
     },
     // 条件分页查询
     getLocalProductTableBtn() {
+      this.page = 1
       this.projectLibrarySearch.page = 1;
-      this.isAdvancedSearch = false;
+      this.isAdvancedSearch = true;
       this.getLocalProductTable();
     },
     // 查询本地产品
@@ -1236,6 +1238,7 @@ export default {
     },
 
     getLocalProductTableBtns() {
+      this.page = 1
       this.projectLibrarySearch.page = 1;
       this.isAdvancedSearch = false;
       this.getLocalProductTables();
@@ -1415,12 +1418,20 @@ export default {
     // 分页点击后方法
     pageChange(page) {
       this.page = page;
-      this.getLocalProductTable();
+      if (this.isAdvancedSearch = true) {
+        this.getLocalProductTable()
+      } else {
+        this.getLocalProductTables()
+      }
     },
     // 分页每页显示数改变后方法
     pageSizeChange(pageSize) {
       this.pageSize = pageSize;
-      this.getLocalProductTable();
+      if (this.isAdvancedSearch = true) {
+        this.getLocalProductTable()
+      } else {
+        this.getLocalProductTables()
+      }
       // 此处需要调用接口，修改个人配置
     },
     /**