diff --git a/src/common/lang/system/zh.js b/src/common/lang/system/zh.js index 74b713d8..b8cf69d0 100644 --- a/src/common/lang/system/zh.js +++ b/src/common/lang/system/zh.js @@ -52,7 +52,8 @@ module.exports = { parentName: '父级名称', select: '下拉选择', tree: '树形结构', - pleaseEnterYourEnglishName: '请输入英文字段名称' + pleaseEnterYourEnglishName: '请输入英文字段名称', + usableRange: '使用范围' }, // 内部工作组 internalWorkGroup: { diff --git a/src/components/dict/JMultiSelectTag.vue b/src/components/dict/JMultiSelectTag.vue index 662b57cc..9738897b 100644 --- a/src/components/dict/JMultiSelectTag.vue +++ b/src/components/dict/JMultiSelectTag.vue @@ -85,7 +85,9 @@ export default { dictCode: { immediate: true, handler () { - this.initDictData() + if (this.dictCode) { + this.initDictData() + } } }, value: { diff --git a/src/views/documentTool/documentSplit/modules/SplitAddForm.vue b/src/views/documentTool/documentSplit/modules/SplitAddForm.vue index 3dfcbeea..4a9ab314 100644 --- a/src/views/documentTool/documentSplit/modules/SplitAddForm.vue +++ b/src/views/documentTool/documentSplit/modules/SplitAddForm.vue @@ -151,6 +151,16 @@ :label-in-value="false" @change="updateDom" :placeholder="$t('pleaseSelect')+item.dbFieldTxt" /> + + @@ -225,10 +235,12 @@ import { FieldType, TypeOfClauseItem, YesOrNoEnum } from '../../../../enums/comm import { getAction } from '../../../../api/manage' import { getFormDictTreeList } from '../../../../api/api' import STreeSelect from '../../../../components/STreeSelect' +import TreeSelection from '../../../../components/selection/TreeSelection' export default { name: 'SplitAddForm', components: { + TreeSelection, JMultipleDatePicker, UserSelection, SplitDetailAddTable, UploadFile, diff --git a/src/views/documentTool/documentSplit/modules/SplitDetailBatchEditDrawer.vue b/src/views/documentTool/documentSplit/modules/SplitDetailBatchEditDrawer.vue index 1611c0ba..41e83123 100644 --- a/src/views/documentTool/documentSplit/modules/SplitDetailBatchEditDrawer.vue +++ b/src/views/documentTool/documentSplit/modules/SplitDetailBatchEditDrawer.vue @@ -146,6 +146,16 @@ :tree-data="optionsData[item.dbFieldName]" :label-in-value="false" :placeholder="$t('pleaseSelect')+item.dbFieldTxt"/> + + @@ -174,10 +184,11 @@ import { FieldType, YesOrNoEnum } from '../../../../enums/commonEnums' import { getFormDictTreeList } from '../../../../api/api' import { getAction } from '../../../../api/manage' import STreeSelect from '../../../../components/STreeSelect' +import TreeSelection from '../../../../components/selection/TreeSelection' export default { name: 'SplitDetailBatchEditDrawer', - components: { UserSelection, StandardSelection, UploadFile, JMultipleDatePicker, STreeSelect }, + components: { TreeSelection, UserSelection, StandardSelection, UploadFile, JMultipleDatePicker, STreeSelect }, data () { return { FieldType, diff --git a/src/views/system/tags/modules/ClauseSplittingDrawer.vue b/src/views/system/tags/modules/ClauseSplittingDrawer.vue index f1ed9a90..ab38d586 100644 --- a/src/views/system/tags/modules/ClauseSplittingDrawer.vue +++ b/src/views/system/tags/modules/ClauseSplittingDrawer.vue @@ -24,7 +24,11 @@ - + {{ translate(item.langKey) }} @@ -49,7 +53,7 @@ > - + + + + +