diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 7beff7d4d..77af40b60 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -151,7 +151,9 @@ module.exports = { permissionTemporrily:'普通员工暂此权限', DepartmentRole:'部门角色', DictionaryName:'字典名称', + DictionaryEnName:'字典英文名称', enterDictionary:'请输入字典名称', + enterEnDictionary:'请输入字典英文名称', DictionaryNumber:'字典编号', enterDictionaryNumber:'请输入字典编号', DictionaryInformation:'字典信息', diff --git a/jero-web/src/views/system/DictList.vue b/jero-web/src/views/system/DictList.vue index 9bb0bf894..50b46239d 100644 --- a/jero-web/src/views/system/DictList.vue +++ b/jero-web/src/views/system/DictList.vue @@ -10,6 +10,11 @@ + + + + + @@ -105,6 +110,12 @@ align: "left", dataIndex: 'dictName', }, + { + title: this.$t('DictionaryEnName'), + align: "left", + width: 180, + dataIndex: 'dictEnName', + }, { title: this.$t('DictionaryNumber'), align: "left", @@ -172,6 +183,7 @@ searchReset() { var that = this; that.queryParam.dictName = ""; + that.queryParam.dictEnName = ""; that.queryParam.dictCode = ""; that.loadData(this.ipagination.current); }, diff --git a/jero-web/src/views/system/modules/DictModal.vue b/jero-web/src/views/system/modules/DictModal.vue index 03b4098e7..7ee54189b 100644 --- a/jero-web/src/views/system/modules/DictModal.vue +++ b/jero-web/src/views/system/modules/DictModal.vue @@ -18,6 +18,13 @@ + + + + { - this.form.setFieldsValue(pick(this.model, 'dictName', 'dictCode', 'description')) + this.form.setFieldsValue(pick(this.model, 'dictName', 'dictEnName', 'dictCode', 'description')) }) }, // 确定 @@ -114,6 +124,7 @@ if (!err) { that.confirmLoading = true values.dictName = (values.dictName || '').trim() + values.dictEnName = (values.dictEnName || '').trim() values.dictCode = (values.dictCode || '').trim() values.description = (values.description || '').trim() let formData = Object.assign(this.model, values)