diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue index 3a326e5..38e8f2f 100644 --- a/src/components/customField/AddForm.vue +++ b/src/components/customField/AddForm.vue @@ -114,6 +114,7 @@ tree-checkable treeCheckStrictly dropdownMatchSelectWidth + :replaceFields="{title: isChinese() ? 'title' : 'enTitle'}" :placeholder="$t('pleaseSelect')+item.dbFieldTxt" /> @@ -35,6 +36,7 @@ show-search allowClear :filterTreeNode="filterTreeOption" + :replaceFields="{title: isChinese() ? 'title' : 'enTitle'}" :placeholder="$t('pleaseSelect')+item.dbFieldTxt" /> @@ -188,6 +190,7 @@ show-search allowClear :filterTreeNode="filterTreeOption" + :replaceFields="{title: isChinese() ? 'title' : 'enTitle'}" /> @@ -204,6 +207,7 @@ show-search allowClear :filterTreeNode="filterTreeOption" + :replaceFields="{title: isChinese() ? 'title' : 'enTitle'}" /> diff --git a/src/mixins/ConfigurableTableMixin.js b/src/mixins/ConfigurableTableMixin.js index 7cd6da6..01f3774 100644 --- a/src/mixins/ConfigurableTableMixin.js +++ b/src/mixins/ConfigurableTableMixin.js @@ -162,9 +162,9 @@ export const ConfigurableTableMixin = { // 是否可排序 item.sorter = item.sortFlag === '1' item.width = 215 - item.title = this.$i18n.locale === ZH ? item.dbFieldTxt : item.dbFieldEnName + item.title = this.isChinese() ? item.dbFieldTxt : item.dbFieldEnName if (NEED_DICT_FIELD_TYPE.includes(item.fieldShowType)) { - item.dataIndex = item.dbFieldName + '_dictText' + item.dataIndex = this.isChinese() ? item.dbFieldName + '_dictText' : item.dbFieldName + '_dictTextEn' } else { item.dataIndex = item.dbFieldName } diff --git a/src/views/standardRegulationLibrary/foreignStandard/modules/SelectionForeignStandardDrawer.vue b/src/views/standardRegulationLibrary/foreignStandard/modules/SelectionForeignStandardDrawer.vue index 603c66a..8ac67bc 100644 --- a/src/views/standardRegulationLibrary/foreignStandard/modules/SelectionForeignStandardDrawer.vue +++ b/src/views/standardRegulationLibrary/foreignStandard/modules/SelectionForeignStandardDrawer.vue @@ -48,6 +48,14 @@ + + +