diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 9bf2aa79d..376bc7375 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1419,7 +1419,7 @@ module.exports = { confirmLaunchTask:'Confirm launch task ?', conditionsNotMet:'Conditions not met', onlyProcessStatusReturned:'Only the data whose process status is list to be checked and rejected by the responsible person can be returned', - onlyProcessReturned:'Only data with process status of list to be checked and rejected by responsible person can be initiated', + onlyProcessReturned:'Only data with process status of list to be checked and rejected by responsible person can be initiated And the project interface person and responsible person cannot be blank', confirmToAcceptTheTask:'Confirm to accept the task ?', confirmRejectTask:'Confirm Reject Task ?', onlyDataStatusConfirmedSelected:'Only data with process status of task to be confirmed can be selected', @@ -1438,7 +1438,7 @@ 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 And the deadline cannot be empty', type:'type', select:'select', onlyDataWithProcessStatusDeleted:'Only data with process status of list to be released and approved can be deleted', @@ -1710,4 +1710,6 @@ module.exports = { implementationrecords:'Fault handling measures and emergency response implementation records', onlyDataWithListStatusDraftCanBeDeleted:'Only data with a list status of Draft can be deleted', implementationDateTwo:'Implementation Date', + reasonForReturn:'Reason For Return', + pleaseFillInTheInformationTaskProcess:'Please fill in the information of the project interface person and responsible person before initiating the task process' } \ 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 83a9c7fd1..024f495ef 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1518,7 +1518,7 @@ module.exports = { confirmLaunchTask:'确认发起任务?', conditionsNotMet:'不满足条件', onlyProcessStatusReturned:'只能退回流程状态为清单待校核和责任人拒绝的数据', - onlyProcessReturned:'只能发起流程状态为清单待校核和责任人拒绝的数据', + onlyProcessReturned:'只能发起流程状态为清单待校核和责任人拒绝的数据,并且工程接口人和责任人不能为空', confirmToAcceptTheTask:'确认接受任务?', confirmRejectTask:'确认拒绝任务?', onlyDataStatusConfirmedSelected:'只能选择流程状态为任务待确认的数据', @@ -1540,7 +1540,7 @@ module.exports = { onlyDataSelected:'只能选择流程状态为任务待确认、结果待提交、审查退回的数据', youCannotStatusListToBeReleasedAndApproved:'不能选择流程状态为清单待发布、审查通过的数据', batchmodify:'是否批量修改', - onlyDataListReleasedAndCertificationReturnCanSelected:'只能选择流程状态为清单待发布和认证退回的数据', + onlyDataListReleasedAndCertificationReturnCanSelected:'只能选择流程状态为清单待发布和认证退回的数据,并且截止时间不能为空', type:'类型', select:'选择', onlyDataWithProcessStatusDeleted:'只能删除流程状态为清单待发布和审查通过的数据', @@ -1810,4 +1810,6 @@ module.exports = { implementationrecords:'故障处置措施和应急响应实施记录', onlyDataWithListStatusDraftCanBeDeleted:'只能删除清单状态为草稿的数据', implementationDateTwo:'实施日期', + reasonForReturn:'Reason For Return', + pleaseFillInTheInformationTaskProcess:'请填写工程接口人和责任人信息后再发起任务流程' } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index 25f1f896c..8417b5850 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -798,6 +798,10 @@ this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || [] //工程接口人 if (res.result.engineeringInterfacePersonList && res.result.engineeringInterfacePersonList.length == 1) { this.formInline.sdt = res.result.engineeringInterfacePersonList[0].value + if (!this.formInline.dutyPersonName) { + this.formInline.dutyPersonName = res.result.engineeringInterfacePersonList[0].name + this.formInline.dutyPerson = res.result.engineeringInterfacePersonList[0].value + } } else if (this.engineeringInterfacePersonList.length == 0) { this.formInline.sdt = undefined } diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index ec076d2c6..684a6383f 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -367,6 +367,14 @@ {{result.certificationProgress_dictText ? result.certificationProgress_dictText : $t('maintainProgress')}} + + + {{$t('viewFile')}} + + -- +
* - {{ $t('reasonsForRejection') }} + {{ $t('reasonForReturn') }}
@@ -768,7 +768,7 @@ commentContent: [ { required: true, - message: this.$t('reasonsForRejection') + this.$t('cannotEmpty'), + message: this.$t('reasonForReturn') + this.$t('cannotEmpty'), trigger: 'blur' } ]