diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 483791338..26eaa81c6 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1108,8 +1108,9 @@ module.exports = { requiredParametersEmpty: 'Required parameters cannot be empty', PleaseTaskConfirmationRejected: 'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected', theProjectContactEmpty: 'The project contact person of cannot be empty', - pleaseSelectinitiatedOrRejected: 'Please select the data whose list confirmation status is not initiated or rejected', + pleaseSelectinitiatedOrRejected: 'Please select the data whose design compliance confirmation process status is List to be Published or whose verification compliance confirmation process status is List to be Published', TheEngineerAndCertification: 'The regulatory engineer of cannot be empty', + pleaseSelectTheDataverificationVerified:'Please select the data whose design compliance confirmation process status is List to Be Checked or whose verification compliance confirmation process status is List to Be Checked', theResponsiblePersonAndDeadlineClank: 'The responsible person and deadline of cannot be blank', bringInTheProjectInterface: 'Assign to Owner', theCurrentListSaved: 'The current list data has been submitted and cannot be temporarily saved', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index c8930af65..bb1c0c1f2 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -703,7 +703,8 @@ module.exports = { listConfirmation: '清单确认', ListConfirmationDeadline: '清单确认截止时间', dataConfirmation: '请选择清单确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空', - pleaseSelectinitiatedOrRejected: '请选择清单确认状态为未发起或拒绝的数据', + pleaseSelectinitiatedOrRejected: '请选择设计符合性确认流程状态为清单待发布或验证符合性确认流程状态为清单待发布的数据', + pleaseSelectTheDataverificationVerified:'请选择设计符合性确认流程状态为清单待校核或验证符合性确认流程状态为清单待校核的数据', TheEngineerAndCertification: '的法规工程师不能为空', taskDataConfirmation: '请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据,以及工程接口人不为空', theProjectContactEmpty: '的工程接口人不能为空', diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 5ab1b9294..c7c7ce3a9 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -32,88 +32,88 @@ + :triggerChange="false" :dictCode="'duty_territory'"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + :fieldList="fieldList"/> {{ $t('query') }} {{ $t('reset') }} - - - - + + + + -
- +
- + {{ $t('Transfer') }}
- +
- + {{ $t('bringInRelevantPersonnel') }}
- -
- + +
+ {{ $t('BatchSetting') }}
- +
- + {{ $t('customize') }}
- + \ No newline at end of file