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}` } } },