diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 19caccf21..87fa00ebf 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1409,7 +1409,7 @@ module.exports = { itemInformation:'Item Information', modifyHistory:'Historical Record', returnToStudio:'Return to Studio', - Approved:'Review and pass', + Approved:'Approved', returnedForApproval:'Returned For Approval', changeSetting:'Change Setting', referenceDeliverables:'Reference Deliverables', @@ -1430,8 +1430,8 @@ module.exports = { onlyDataStatusSubmittedCanBeSelected:'Only data with process status of result to be submitted can be selected', operationWithoutPermission:'Operation without permission', data:"'s data", - confirmApproval:'Confirm approval?', - confirmReturnForApproval:'Confirm return for approval ?', + confirmApproval:'Confirm pass review?', + confirmReturnForApproval:'Confirm Return for review ?', onlyDataStatusResultReviewedCanBeSelected:'Only data with process status of result to be reviewed can be selected', confirmResetProcess:'Confirm reset process?', confirmUrging:'Confirm urging ?', @@ -1756,4 +1756,6 @@ module.exports = { nonCompliance:'Non-Compliance', toBeTracked:'To be tracked', NA:'NA', + reviewAndPass:'Review and pass', + reviewAndReturn:'Review and return', } \ 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 c59ba232c..69345e424 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1511,7 +1511,7 @@ module.exports = { itemInformation:'条目信息', modifyHistory:'历史记录', returnToStudio:'退回至Studio', - Approved:'审查通过', + Approved:'审批通过', returnedForApproval:'审批退回', changeSetting:'修改配置', referenceDeliverables:'引用交付物', @@ -1532,8 +1532,8 @@ module.exports = { data:"的数据", compliancereport:'生成合规报告', todocenter:'待办中心', - confirmApproval:'确认通过审批?', - confirmReturnForApproval:'确认退回审批?', + confirmApproval:'确认通过审查?', + confirmReturnForApproval:'确认退回审查?', onlyDataStatusResultReviewedCanBeSelected:'只能选择流程状态为结果待审查的数据', confirmResetProcess:'确认重置流程?', confirmUrging:'确认催办', @@ -1858,4 +1858,6 @@ module.exports = { nonCompliance:'不符合', toBeTracked:'待追踪', NA:'不涉及', + reviewAndPass:'审查通过', + reviewAndReturn:'审查退回', } \ 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 d881e97b0..ca0a3eb54 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -29,7 +29,7 @@ + :value="item.standId"> {{ item.serialNumber}} @@ -808,7 +808,7 @@ return res.id === value }) if (content && content.length > 0) { - this.formInline.bussDocumentLibraryId = content[0].id + this.formInline.bussDocumentLibraryId = content[0].standId this.formInline.serialNumber = content[0].serialNumber } }, diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 1317235d0..f171c2343 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -205,14 +205,14 @@
- {{ $t('Approved') }} + {{ $t('reviewAndPass') }}
- {{ $t('returnedForApproval') }} + {{ $t('reviewAndReturn') }}