From ee43b9c2781c727ff8e9a295879c75594868f666 Mon Sep 17 00:00:00 2001 From: danshihao Date: Thu, 27 Jun 2024 09:15:30 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90update=20=E9=AB=98=E7=BA=A7=E6=A3=80?= =?UTF-8?q?=E7=B4=A2=E3=80=91=E5=AF=BC=E5=87=BA=E5=8F=82=E6=95=B0=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/search/AdvancedSearch.vue | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/views/dashboard/search/AdvancedSearch.vue b/src/views/dashboard/search/AdvancedSearch.vue index 97c803f..43b239b 100644 --- a/src/views/dashboard/search/AdvancedSearch.vue +++ b/src/views/dashboard/search/AdvancedSearch.vue @@ -234,7 +234,7 @@ export default { currStandardType: '1', standardTypeOptions: [ // 全部 - { label: this.$t('dashboard.advancedSearch.all'), value: 'all' }, + { label: this.$t('dashboard.advancedSearch.all'), value: '5' }, // 外来标准法规 { label: this.$t('dashboard.advancedSearch.foreignStandards'), value: StandardSource.FOREIGN.value }, // 企业标准 @@ -486,7 +486,7 @@ export default { this.getDataListFunc = getEnterStandardList this.getFormFunc = getEnterpriseStandardAddForm this.getDocumentInfoFunc = getEnterpriseStandardInfoById - } else if (val === 'all') { + } else if (val === '5') { this.getQueryConditionFunc = getDomesticStandardQuery this.getDataListFunc = getAdvancedSearchAll this.getFormFunc = getEnterpriseStandardAddForm @@ -515,7 +515,7 @@ export default { fileName = '导出文件' } const param = this.getQueryParams() - param.standardType = this.currStandardType + param.resourceType = this.currStandardType if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { param.selections = this.selectedRowKeys.join(',') } @@ -720,10 +720,12 @@ export default { showSizeChanger: true, total: 0 } - if (value === StandardSource.ENTERPRISE.value) { - this.queryParam.standard_state = this.defaultEnStandardStatus - } else { - this.queryParam.standard_state = this.defaultStandardStatus + if (this.currStandardType !== '4') { + if (value === StandardSource.ENTERPRISE.value) { + this.queryParam.standard_state = this.defaultEnStandardStatus + } else { + this.queryParam.standard_state = this.defaultStandardStatus + } } }, onChange (item) { @@ -865,10 +867,12 @@ export default { // 重置 searchReset () { this.queryParam = {} - if (this.currStandardType === StandardSource.ENTERPRISE.value) { - this.queryParam.standard_state = this.defaultEnStandardStatus - } else { - this.queryParam.standard_state = this.defaultStandardStatus + if (this.currStandardType !== '4') { + if (this.currStandardType === StandardSource.ENTERPRISE.value) { + this.queryParam.standard_state = this.defaultEnStandardStatus + } else { + this.queryParam.standard_state = this.defaultStandardStatus + } } this.dataSource = [] this.clauseDataSource = []