diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 538d01790..e64e815ee 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -665,4 +665,6 @@ module.exports = { listConfirmationStatus:'List confirmation status', ListConfirmationDeadline:'List confirmation deadline', dataConfirmation:'Please select the data whose list confirmation status is not initiated or rejected, and the regulatory engineer and certification engineer are not empty', + pleaseSelectPersonFirst:'Please select a person first', + onlyOnePersonCanBeSelected:'Only one person can be selected', } \ 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 d8c979c06..4028232c8 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -669,4 +669,6 @@ module.exports = { listConfirmationStatus:'清单确认状态', ListConfirmationDeadline:'清单确认截止时间', dataConfirmation:'请选择清单确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空', + pleaseSelectPersonFirst:'请先选择人员', + onlyOnePersonCanBeSelected:'只能选择一个人员', } \ No newline at end of file diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue index d95f44987..6fcba260d 100644 --- a/jero-web/src/components/PersonnelSelection/index.vue +++ b/jero-web/src/components/PersonnelSelection/index.vue @@ -47,7 +47,7 @@ export default { name: 'index', - props: ['query', 'value', 'personneQuery'], + props: ['query', 'value', 'personneQuery','isSingleChoice'], data() { return { loading: true, @@ -96,6 +96,11 @@ }, handleSubmit() { if (this.userIds && this.userIds.length > 0) { + if (this.isSingleChoice){ + if (this.userIds.length > 1){ + this.$message.warning(this.$t('onlyOnePersonCanBeSelected')) + } + } let userIds = JSON.parse(JSON.stringify(this.userIds)) let userName = JSON.parse(JSON.stringify(this.userName)) this.$emit('input', userName.join(',')) @@ -103,7 +108,7 @@ this.visible = false this.treeVisible = false } else { - this.$message.warning('请先选择人员') + this.$message.warning(this.$t('pleaseSelectPersonFirst')) } }, indexclick(event) { diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue index 51f60588f..0665fbcc5 100644 --- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue @@ -237,6 +237,23 @@ + + + + + {{$t('zoneOfApplication')}} + + + + + + + diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 144db82dd..825014bf5 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -224,6 +224,12 @@ ellipsis: true, dataIndex: 'correspondingStandard' }, + { + title: this.$t('zoneOfApplication'), + align: 'center', + ellipsis: true, + dataIndex: 'region_dictText' + }, { title: this.$t('implementationCategory'), align: 'center', diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue index 1ef7d466c..6aa19f9ca 100644 --- a/jero-web/src/views/projectManagement/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/addModel.vue @@ -68,6 +68,7 @@