diff --git a/src/api/standardRegulationLibraryApi.js b/src/api/standardRegulationLibraryApi.js index 042bfe0a..2fc2c479 100644 --- a/src/api/standardRegulationLibraryApi.js +++ b/src/api/standardRegulationLibraryApi.js @@ -34,6 +34,8 @@ const editDomesticStandard = (params) => postAction('/laws/standard/domestic/com const getDomesticStandardNoSystem = (params) => getAction('/laws/standard/common/getStandardRightBox', params) // 国内标准-获取详情信息 const getDomesticStandardDetail = (params) => getAction('/laws/standard/domestic/getByIdAndModule', params) +// 国内标准-获取更新记录 +const getDomesticStandardUpdateRecord = (params) => getAction('/laws/standard/domestic/getUpdateRecordList', params) // 海外标准-获取查询条件 const getOverseasStandardSearchForm = (params) => getAction('/laws/standard/overseas/getQueryCondition', params) @@ -63,6 +65,7 @@ export { editDomesticStandard, getDomesticStandardNoSystem, getDomesticStandardDetail, + getDomesticStandardUpdateRecord, // 海外标准 getOverseasStandardSearchForm, diff --git a/src/mixins/ConfigurableTableMixin.js b/src/mixins/ConfigurableTableMixin.js index 26ffca67..5e759ee2 100644 --- a/src/mixins/ConfigurableTableMixin.js +++ b/src/mixins/ConfigurableTableMixin.js @@ -6,9 +6,13 @@ import Vue from 'vue' import { ACCESS_TOKEN } from '@/store/mutation-types' import store from '@/store' import { isHasPermission } from '../utils/hasPermission.js' +import { FieldType } from '../enums/commonEnums.js' let importModalLoading +// 需要数据字段翻译的属性类型 +const NEED_DICT_FIELD_TYPE = [FieldType.USER_SINGLE.value, FieldType.ORGAN_SINGLE.value, FieldType.STANDARD_MORE.value, FieldType.ORGAN_MORE.value, FieldType.OPTION_SINGLE.value, FieldType.OPTION_MORE.value, FieldType.TREE.value] + export const ConfigurableTableMixin = { data () { return { @@ -96,6 +100,7 @@ export const ConfigurableTableMixin = { this.getTableHeaderFunc(params).then(res => { if (res.success) { this.columns = this.dealColumns(res.result || []) + console.log(this.columns) this.isTrue = false this.$nextTick(() => { this.isTrue = true @@ -112,12 +117,7 @@ export const ConfigurableTableMixin = { const tempColumns = [] columns.forEach(item => { // 可点击项加入插槽 - // 标准编号和标准名称可以跳转详情页 - if (item.dbFieldName === 'standard_number' || item.dbFieldName === 'standard_name') { - item.scopedSlots = { - customRender: 'detailClick' - } - } else if (item.urlClick === 'true') { + if (item.urlClick === 'true') { item.scopedSlots = { customRender: 'urlClick' } @@ -126,7 +126,11 @@ export const ConfigurableTableMixin = { item.sorter = item.sortFlag === 1 item.width = 215 item.title = item.dbFieldTxt - item.dataIndex = item.dbFieldName + if (NEED_DICT_FIELD_TYPE.includes(item.fieldShowType)) { + item.dataIndex = item.dbFieldName + '_dictText' + } else { + item.dataIndex = item.dbFieldName + } // 在各自页面写此页面需要使用插槽的字段 if (this.tableSlotField && this.tableSlotField.includes(item.dbFieldName)) { item.scopedSlots = { diff --git a/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue b/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue index f67f551d..e3826ebb 100644 --- a/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue +++ b/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue @@ -26,7 +26,7 @@
- {{ detailData[formItem.dbFieldName] }} + {{ detailData[needDictFieldList.includes(formItem.fieldShowType) ? formItem.dbFieldName + '_dictText' : formItem.dbFieldName] }}
@@ -60,7 +60,7 @@ - + @@ -72,9 +72,9 @@