diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index a3cae3c90..84df9ad14 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1432,6 +1432,6 @@ module.exports = { onlyDataSelected:'Only data with process status of task to be confirmed, result to be submitted and review to be returned can be selected', youCannotStatusListToBeReleasedAndApproved:'You cannot select data whose process status is list to be released and approved', batchmodify:'Whether to batch modify', - onlyDataListReleasedAndCertificationReturnCanSelected:'Only data with the process status of list to be released and certification return can be selected' - + onlyDataListReleasedAndCertificationReturnCanSelected:'Only data with the process status of list to be released and certification return can be selected', + type:'type', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 94cd7224c..0794ef912 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1534,5 +1534,6 @@ module.exports = { onlyDataSelected:'只能选择流程状态为任务待确认、结果待提交、审查退回的数据', youCannotStatusListToBeReleasedAndApproved:'不能选择流程状态为清单待发布、审查通过的数据', batchmodify:'是否批量修改', - onlyDataListReleasedAndCertificationReturnCanSelected:'只能选择流程状态为清单待发布和认证退回的数据' + onlyDataListReleasedAndCertificationReturnCanSelected:'只能选择流程状态为清单待发布和认证退回的数据', + type:'类型', } \ No newline at end of file diff --git a/jero-web/src/views/documentManage/tags/dialog/DicList.vue b/jero-web/src/views/documentManage/tags/dialog/DicList.vue index 383f989e0..aea21c70d 100644 --- a/jero-web/src/views/documentManage/tags/dialog/DicList.vue +++ b/jero-web/src/views/documentManage/tags/dialog/DicList.vue @@ -55,6 +55,15 @@ + + + + {{item.name}} + + + @@ -105,6 +114,20 @@ pageSize: 10 },//查询条件 form: {}, + valueTypeList:[ + { + id:'file', + name:this.$t('enclosure') + }, + { + id:'text', + name:this.$t('text') + }, + { + id:'N/A', + name:'NA' + } + ], newVisible: false, rules: { name: [ @@ -112,6 +135,9 @@ { min: 1, max: 100, message: this.$t('cantExeed') + '100' + this.$t('characters'), trigger: 'blur' }, { validator: this.test } ], + valueType:[ + { required: true, message: this.$t('type') + this.$t('cannotEmpty'), trigger: 'change' }, + ], itemText: [ { required: true, message: this.$t('enterName'), trigger: 'blur' }, { min: 1, max: 100, message: this.$t('cantExeed') + '100' + this.$t('characters'), trigger: 'blur' }, @@ -147,7 +173,8 @@ editPId: '', tabletreeDataSource: [], flag: false, //提交表单标识 - parentDataPid: [] + parentDataPid: [], + valueTypeVisible:true } }, watch: { diff --git a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue index 58ca41b03..74bcfe483 100644 --- a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue +++ b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue @@ -73,8 +73,9 @@