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

---
 .../domesticStandardsAndRegulations/index.vue       | 13 ++++++++-----
 .../foreignStandardsAndRegulations/index.vue        |  9 ++++++---
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 1e15fb23d..15617d7aa 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -105,7 +105,7 @@
                     size="mini"
                     class="common-button-primary"
                     v-btn-permission="'967c8b1402459951b5f75fcd1c548665'"
-                    @click="searchBtnClick(standCommonlySearch)">
+                    @click="searchBtnClick(standCommonlySearch, 1)">
                     查询
                   </el-button>
                   <el-button
@@ -3723,9 +3723,9 @@ export default {
       this.getDomesticStandardTable(this.standCommonlySearch)
     },
     // 点击搜索按钮
-    searchBtnClick(standCommonlySearch) {
+    searchBtnClick(standCommonlySearch, type) {
       let item = this.standCommonlySearch
-      this.getDomesticStandardTable(item)
+      this.getDomesticStandardTable(item, type)
     },
     // 搜索
     getDomesticStandardTableBtn(item) {
@@ -3823,7 +3823,7 @@ export default {
     // 高级检索
     selectMoreBtn() {
       this.isAdvancedSearch = true
-      this.sarStandardsSearch = {}
+      // this.sarStandardsSearch = {}
     },
     treeCollapse() {
       this.sideClose = !this.sideClose
@@ -4547,7 +4547,7 @@ export default {
       // 此处需要调用接口，修改个人配置
     },
     // 分页查询国内标准
-    getDomesticStandardTable(item) {
+    getDomesticStandardTable(item, type) {
       if (item !== '' && item !== null && item !== undefined) {
         item.pageSize = this.$store.getters.userInfo.configContent
       }
@@ -4670,6 +4670,9 @@ export default {
           if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarStandardsSearch.page !== 1) {
             this.pageChange(1)
           }
+          if (type === 1) {
+            this.sarStandardsSearch = {}
+          }
         } else {
           this.$message.error(res.message)
         }
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index a6b77cbc1..1f8e3a39b 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -101,7 +101,7 @@
                     class="common-button-primary"
                     size="mini"
                     v-btn-permission="'366c89d1c54465faca96aaed26a158b1'"
-                    @click="searchBtnClick(standCommonlySearch)">
+                    @click="searchBtnClick(standCommonlySearch, 1)">
                     查询
                   </el-button>
                   <el-button
@@ -3147,8 +3147,8 @@ export default {
       this.getDomesticStandardTable()
     },
     // 点击搜索按钮
-    searchBtnClick() {
-      this.getDomesticStandardTable()
+    searchBtnClick(type) {
+      this.getDomesticStandardTable(undefined ,type)
     },
     // 搜索
     getDomesticStandardTableBtn(item) {
@@ -4017,6 +4017,9 @@ export default {
           }
           if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.standCommonlySearch.page !== 1) {
             this.pageChange(1)
+          }
+          if (type === 1) {
+
           }
           this.stahndinfoList = res.data.list
           this.total = res.data.count