From 51df27ff1317d242a9ab76177e2db15ccb6152ce Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 21 Mar 2024 09:38:16 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E5=9B=BD=E6=A0=87?=
 =?UTF-8?q?=EF=BC=8C=E5=A4=96=E6=A0=87=EF=BC=8C=E9=AB=98=E7=BA=A7=E6=A3=80?=
 =?UTF-8?q?=E7=B4=A2=E5=9B=BD=E6=A0=87=E5=A4=96=E6=A0=87=E7=9A=84=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=A0=87=E5=87=86=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/search/AdvancedSearch.vue    | 16 ++++++++++------
 .../domesticStandard/DomesticStandardList.vue    |  2 +-
 .../overseasStandard/OverseasStandardList.vue    |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/dashboard/search/AdvancedSearch.vue b/src/views/dashboard/search/AdvancedSearch.vue
index 93f6b3b5..4d21a320 100644
--- a/src/views/dashboard/search/AdvancedSearch.vue
+++ b/src/views/dashboard/search/AdvancedSearch.vue
@@ -243,7 +243,11 @@ export default {
         showQuickJumper: true,
         showSizeChanger: true,
         total: 0
-      }
+      },
+      // 国标和外标的默认标准状态
+      defaultStandardStatus: `${StandardStatus.CURRENTLY_EFFECTIVE.value},${StandardStatus.BE_IMPLEMENTED_SOON.value},${StandardStatus.ABOLISH.value}`,
+      // 企标的默认标准状态
+      defaultEnStandardStatus: `${EnterpriseStandardStatus.CURRENTLY_EFFECTIVE.value},${EnterpriseStandardStatus.TRIAL_OPERATION.value},${EnterpriseStandardStatus.ABOLISH.value}`
     }
   },
   watch: {
@@ -269,7 +273,7 @@ export default {
     this.getQueryConditionFunc = getDomesticStandardQuery
     this.getSearch()
     this.getSysCategoryTree()
-    this.queryParam.standard_state = '6,7'
+    this.queryParam.standard_state = this.defaultStandardStatus
   },
   methods: {
     // 点击一般检索
@@ -313,9 +317,9 @@ export default {
         total: 0
       }
       if (value === StandardSource.ENTERPRISE.value) {
-        this.queryParam.standard_state = `${EnterpriseStandardStatus.CURRENTLY_EFFECTIVE.value},${EnterpriseStandardStatus.TRIAL_OPERATION.value},${EnterpriseStandardStatus.ABOLISH.value}`
+        this.queryParam.standard_state = this.defaultEnStandardStatus
       } else {
-        this.queryParam.standard_state = `${StandardStatus.CURRENTLY_EFFECTIVE.value},${StandardStatus.ABOLISH.value}`
+        this.queryParam.standard_state = this.defaultStandardStatus
       }
     },
     onChange (item) {
@@ -448,9 +452,9 @@ export default {
     searchReset () {
       this.queryParam = {}
       if (this.currStandardType === StandardSource.ENTERPRISE.value) {
-        this.queryParam.standard_state = `${EnterpriseStandardStatus.CURRENTLY_EFFECTIVE.value},${EnterpriseStandardStatus.TRIAL_OPERATION.value},${EnterpriseStandardStatus.ABOLISH.value}`
+        this.queryParam.standard_state = this.defaultEnStandardStatus
       } else {
-        this.queryParam.standard_state = `${StandardStatus.CURRENTLY_EFFECTIVE.value},${StandardStatus.ABOLISH.value}`
+        this.queryParam.standard_state = this.defaultStandardStatus
       }
       this.dataSource = []
       this.ipagination.total = 0
diff --git a/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue b/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue
index 0fb508b3..c25ab518 100644
--- a/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue
+++ b/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue
@@ -351,7 +351,7 @@ export default {
       expandedKeys: [], // 展开的节点
       needFilterTableBtn: true,
       defaultSearchParams: {
-        standard_state: `${StandardStatus.CURRENTLY_EFFECTIVE.value},${StandardStatus.RELEASE.value}`
+        standard_state: `${StandardStatus.CURRENTLY_EFFECTIVE.value},${StandardStatus.BE_IMPLEMENTED_SOON.value},${StandardStatus.RELEASE.value}`
       }
     }
   },
diff --git a/src/views/standardRegulationLibrary/overseasStandard/OverseasStandardList.vue b/src/views/standardRegulationLibrary/overseasStandard/OverseasStandardList.vue
index ccd13b98..1bee45e3 100644
--- a/src/views/standardRegulationLibrary/overseasStandard/OverseasStandardList.vue
+++ b/src/views/standardRegulationLibrary/overseasStandard/OverseasStandardList.vue
@@ -351,7 +351,7 @@ export default {
       isCollection: false,
       expandedKeys: [],
       defaultSearchParams: {
-        standard_state: `${StandardStatus.CURRENTLY_EFFECTIVE.value},${StandardStatus.RELEASE.value}`
+        standard_state: `${StandardStatus.CURRENTLY_EFFECTIVE.value},${StandardStatus.BE_IMPLEMENTED_SOON.value},${StandardStatus.RELEASE.value}`
       }
     }
   },