diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index defc1db5c..be373dc58 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -715,9 +715,9 @@ module.exports = { confirmationOfRegulationsList: 'Regulation List Confirmation', regulatoryTaskConfirmation: 'Regulation Task Confirmation', - certificationStart: 'Homo Test Completion', - preHomoCompletion: 'Pre-Homo Completion', - certificationEnd: 'Type Approval', + certificationStart: 'Homo Completion', + preHomoCompletion: 'Pre-Homo Confirmation', + certificationEnd: 'Homo KO', directoryName: 'Catalogue Name', batch: 'Batch', uploadTime: 'Upload Time', @@ -1274,4 +1274,5 @@ module.exports = { theInconsistentSameResponsibility:'The selected data responsibility fields are inconsistent; Please select the same responsibility', taskConfirmedPersonnelCannotBeSetBatch:'When the task confirmation status is to be confirmed, personnel cannot be set in batch', theSelectedDataResponsibilityFieldCannotEmpty:'The selected data responsibility field cannot be empty', + theTaskConfirmationStatusCannot:'Only the list confirmation status is "reject" or "accept" and the task confirmation status cannot be "data to be confirmed"', } \ 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 1b20b6c2f..9639b2b99 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1376,4 +1376,5 @@ module.exports = { theInconsistentSameResponsibility:'所选的数据责任领域不一致;请选择相同的责任领域', taskConfirmedPersonnelCannotBeSetBatch:'任务确认状态为待确认时无法批量设置人员', theSelectedDataResponsibilityFieldCannotEmpty:'所选数据责任领域不能为空', + theTaskConfirmationStatusCannot:'只能变更清单确认状态为拒绝或接受、及任务确认状态不能为待确认的数据', } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index efb58fae4..79601ac8b 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -97,9 +97,12 @@ }, { title: this.$t('targetMarket'), + value: 'subtitle' + }, + { + title: this.$t('subtitle'), value: 'targetMarket_dictText' }, - {}, { title: this.$t('standard'), value: 'serialNumber', diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index 460c504bd..38b7f34f6 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -808,7 +808,10 @@