diff --git a/src/common/lang/dashboard/en.js b/src/common/lang/dashboard/en.js index e7f3232..6703a11 100644 --- a/src/common/lang/dashboard/en.js +++ b/src/common/lang/dashboard/en.js @@ -12,8 +12,10 @@ module.exports = { standardClass: 'Standard Class', dynamicType: 'Dynamic Type', applicableVehicleType: 'Applicable Vehicle Type', - standardType: 'Standard Type', - state: 'State', + standardCategoryCode: 'Standard classification code', + applicableMarkets: 'Applicable markets', + standardType: 'Type', + state: 'Standard state', enterpriseStandardCode: 'Enterprise Standard Code', standardState: 'Standard State', standardGradeClassification: 'Standard Grade Classification', diff --git a/src/common/lang/dashboard/zh.js b/src/common/lang/dashboard/zh.js index c55e4d8..8ad7069 100644 --- a/src/common/lang/dashboard/zh.js +++ b/src/common/lang/dashboard/zh.js @@ -11,9 +11,11 @@ module.exports = { resourceType: '资源类型', standardClass: '标准类别', dynamicType: '动力类型', - applicableVehicleType: '适用车辆类型', - standardType: '标准类型', - state: '状态', + applicableVehicleType: '适用车型', + standardCategoryCode: '标准分类代码', + applicableMarkets: '适用市场', + standardType: '类型', + state: '标准状态', enterpriseStandardCode: '企业标准代号', standardState: '标准状态', standardGradeClassification: '标准等级分类', diff --git a/src/common/lang/standardRegulationLibrary/en-us.js b/src/common/lang/standardRegulationLibrary/en-us.js index 7fdf918..6086be9 100644 --- a/src/common/lang/standardRegulationLibrary/en-us.js +++ b/src/common/lang/standardRegulationLibrary/en-us.js @@ -110,6 +110,7 @@ module.exports = { pcrNumber: 'PCR number', rectifyFinishingDate: 'Completion date of rectification', viewMarketList: 'View market list', - viewTroubleshootingResults: 'View troubleshooting results' + viewTroubleshootingResults: 'View troubleshooting results', + exportXlsName: 'Standard Master Plan' } } diff --git a/src/common/lang/standardRegulationLibrary/zh-cn.js b/src/common/lang/standardRegulationLibrary/zh-cn.js index 9184aac..9f82d64 100644 --- a/src/common/lang/standardRegulationLibrary/zh-cn.js +++ b/src/common/lang/standardRegulationLibrary/zh-cn.js @@ -111,6 +111,7 @@ module.exports = { pcrNumber: 'PCR编号', rectifyFinishingDate: '整改完成日期', viewMarketList: '查看市场清单', - viewTroubleshootingResults: '查看排查结果' + viewTroubleshootingResults: '查看排查结果', + exportXlsName: '标准主计划' } } diff --git a/src/views/dashboard/search/AdvancedSearch.vue b/src/views/dashboard/search/AdvancedSearch.vue index 4d82a08..1ca5c69 100644 --- a/src/views/dashboard/search/AdvancedSearch.vue +++ b/src/views/dashboard/search/AdvancedSearch.vue @@ -828,6 +828,8 @@ export default { // 标准类型是条款时,默认回显第一个标准的条款 if (this.dataSource.length && this.currStandardType === '4') { this.handleClickStandar(this.dataSource[0]) + } else { + this.clauseDataSource = [] } if (res.result.total) { this.ipagination.total = res.result.total diff --git a/src/views/dashboard/search/GeneralSearch.vue b/src/views/dashboard/search/GeneralSearch.vue index 4673220..058366c 100644 --- a/src/views/dashboard/search/GeneralSearch.vue +++ b/src/views/dashboard/search/GeneralSearch.vue @@ -204,7 +204,8 @@ export default { 'standardState', // 状态 'standardCode', // 企业标准代号 'enterpriseStandardState', // 标准状态 - 'gradeClassification' // 标准等级分类 + 'gradeClassification', // 标准等级分类 + 'categoryCode' // 标准分类代码 ], // 其他筛选条件中所有的key,为了能按顺序遍历 dataSource: [], ipagination: { @@ -326,32 +327,8 @@ export default { // 设置对象key为搜索时需要传给后端的字段名,以及设置选项和字段label for (const item in res.result) { if (res.result[item]) { - let label = '' - if (item === 'applicableVehicle') { - // 适用车辆类型 - label = this.$t('dashboard.generalSearch.applicableVehicleType') - } else if (item === 'dynamicType') { - // 动力类型 - label = this.$t('dashboard.generalSearch.dynamicType') - } else if (item === 'enterpriseStandardState') { - // 标准状态 - label = this.$t('dashboard.generalSearch.standardState') - } else if (item === 'gradeClassification') { - // 标准等级分类 - label = this.$t('dashboard.generalSearch.standardGradeClassification') - } else if (item === 'standardClass') { - // 标准类别 - label = this.$t('dashboard.generalSearch.standardClass') - } else if (item === 'standardCode') { - // 企业标准代号 - label = this.$t('dashboard.generalSearch.enterpriseStandardCode') - } else if (item === 'standardProperty') { - // 标准类型 - label = this.$t('dashboard.generalSearch.standardType') - } else if (item === 'standardState') { - // 状态 - label = this.$t('dashboard.generalSearch.state') - } + // 通过key获取对应label + const label = this.getLabelByKey(item) res.result[item].unshift({ itemText: this.$t('dashboard.generalSearch.all'), itemValue: 'all' }) this.selectOptions[item] = { options: res.result[item], @@ -375,6 +352,40 @@ export default { this.selectOptionLoading = false }) }, + // 通过key获取label + getLabelByKey (key) { + if (key === 'applicableVehicle') { + // 适用车型 + return this.$t('dashboard.generalSearch.applicableVehicleType') + } else if (key === 'dynamicType') { + // 动力类型 + return this.$t('dashboard.generalSearch.dynamicType') + } else if (key === 'enterpriseStandardState') { + // 标准状态 + return this.$t('dashboard.generalSearch.standardState') + } else if (key === 'gradeClassification') { + // 标准等级分类 + return this.$t('dashboard.generalSearch.standardGradeClassification') + } else if (key === 'standardClass') { + // 标准类别 + return this.$t('dashboard.generalSearch.standardClass') + } else if (key === 'standardCode') { + // 企业标准代号 + return this.$t('dashboard.generalSearch.enterpriseStandardCode') + } else if (key === 'standardProperty') { + // 标准类型 + return this.$t('dashboard.generalSearch.standardType') + } else if (key === 'standardState') { + // 状态 + return this.$t('dashboard.generalSearch.state') + } else if (key === 'categoryCode') { + // 标准分类代码 + return this.$t('dashboard.generalSearch.standardCategoryCode') + } else if (key === 'applicableMarket') { + // 适用市场 + return this.$t('dashboard.generalSearch.applicableMarkets') + } + }, // 查询时获取参数 getSearchParam () { const param = {} diff --git a/src/views/standardRegulationLibrary/standardMasterPlan/StandardMasterPlanList.vue b/src/views/standardRegulationLibrary/standardMasterPlan/StandardMasterPlanList.vue index 49214d5..a5ecf1e 100644 --- a/src/views/standardRegulationLibrary/standardMasterPlan/StandardMasterPlanList.vue +++ b/src/views/standardRegulationLibrary/standardMasterPlan/StandardMasterPlanList.vue @@ -33,7 +33,7 @@
{{ $t('add') }} - {{ $t('export') }}