diff --git a/src/api/dashboard.js b/src/api/dashboard.js index 01dc9a9c..8cafb796 100644 --- a/src/api/dashboard.js +++ b/src/api/dashboard.js @@ -22,11 +22,11 @@ const getOverseasStandardQuery = (params) => getAction('/laws/standard/overseas/ const getEnterStandardQuery = (params) => getAction('/laws/standard/enterprise/getQueryCondition', params) // 国内标准的高级搜索,查询列表数据 -const getDomesticStandardList = (params) => getAction('/laws//standard/domestic/getCommonPage', params) +const getDomesticStandardList = (params) => postAction('/laws//standard/domestic/getCommonPage', params) // 国外标准的高级搜索,查询列表数据 -const getOverseasStandardList = (params) => getAction('/laws//standard/overseas/getCommonPage', params) +const getOverseasStandardList = (params) => postAction('/laws//standard/overseas/getCommonPage', params) // 企标的高级搜索,查询列表数据 -const getEnterStandardList = (params) => getAction('/laws/standard/enterprise/getCommonPage', params) +const getEnterStandardList = (params) => postAction('/laws/standard/enterprise/getCommonPage', params) export { getSearchHistoryData, diff --git a/src/common/lang/dashboard/en.js b/src/common/lang/dashboard/en.js index ece5cb9a..6068cf3a 100644 --- a/src/common/lang/dashboard/en.js +++ b/src/common/lang/dashboard/en.js @@ -18,5 +18,13 @@ module.exports = { standardGradeClassification: 'Standard Grade Classification', all: 'All', releaseDate: 'Release Date' + }, + // 高级搜索 + advancedSearch: { + standardNum: '标准号', + standardName: '标准名称', + releaseDate: '发布日期', + materialDate: '实施日期', + standardStatus: '标准状态' } } diff --git a/src/common/lang/dashboard/zh.js b/src/common/lang/dashboard/zh.js index 1f30516c..c6cae41c 100644 --- a/src/common/lang/dashboard/zh.js +++ b/src/common/lang/dashboard/zh.js @@ -18,5 +18,13 @@ module.exports = { standardGradeClassification: '标准等级分类', all: '全部', releaseDate: '发布日期' + }, + // 高级搜索 + advancedSearch: { + standardNum: '标准号', + standardName: '标准名称', + releaseDate: '发布日期', + materialDate: '实施日期', + standardStatus: '标准状态' } } diff --git a/src/views/dashboard/search/AdvancedSearch.vue b/src/views/dashboard/search/AdvancedSearch.vue index 880d60fa..54fa6bfa 100644 --- a/src/views/dashboard/search/AdvancedSearch.vue +++ b/src/views/dashboard/search/AdvancedSearch.vue @@ -59,7 +59,6 @@ @@ -123,7 +122,7 @@ {{ $t('query') }} {{ $t('reset') }} -
+
!!v || v === 0) + if (!flag) { + // 提示至少填写一项 + this.$message.warning(this.$t('pleaseFillInAtLeastOneItem')) + return + } if (arg === 1) { this.ipagination.current = 1 } const params = this.getQueryParams()// 查询条件 - let func - if (this.currStandardType === StandardSource.DOMESTIC.value) { - func = getDomesticStandardList - } else if (this.currStandardType === StandardSource.OVERSEAS.value) { - func = getOverseasStandardList - } else if (this.currStandardType === StandardSource.ENTERPRISE.value) { - func = getEnterStandardList - } this.loading = true - func(params).then((res) => { + this.getDataListFunc(params).then((res) => { if (res.success) { this.dataSource = res.result.records || res.result if (res.result.total) { @@ -431,4 +469,8 @@ export default { text-align: center; margin-top: 10px; } + +.table-wrapper { + margin-top: 20px; +} diff --git a/src/views/dashboard/search/GeneralSearch.vue b/src/views/dashboard/search/GeneralSearch.vue index a1d7ceac..ccb819c9 100644 --- a/src/views/dashboard/search/GeneralSearch.vue +++ b/src/views/dashboard/search/GeneralSearch.vue @@ -59,7 +59,7 @@
-
+
@@ -73,9 +73,10 @@

{{ $t('dashboard.generalSearch.releaseDate') }} {{ item.releaseDate || global.emptyLine }}

-
+
{{ item.content }}
+