Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

# Conflicts:
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
This commit is contained in:
zyx.net
2023-03-08 17:45:08 +08:00
26 changed files with 2394 additions and 98 deletions
+10
View File
@@ -894,7 +894,9 @@ module.exports = {
pleaseConfirmedByPrehomo: 'Please complete the data confirmed by Pre-Homo',
pleaseConformityVerification: 'Please complete the data of Conformity verification',
virtualListDetails: 'Virtual List Details',
virtualAuthenticationListDetails: 'Virtual Authentication List Details',
maintainVirtualList: 'Maintain Virtual List',
certificationListMaintenance: 'Certification List Maintenance',
reasonsForRejection: 'Reasons For Rejection',
inconformity: 'Non-Compliance',
toTrack: 'To be tracked',
@@ -1406,4 +1408,12 @@ module.exports = {
initiateTask:'Initiate a Task',
compliancereport:'Generate compliance report',
todocenter:'To-do center',
areYouReturnToStudio:'Are you sure to return to studio?',
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',
confirmToAcceptTheTask:'Confirm to accept the task ?',
confirmRejectTask:'Confirm Reject Task ?',
onlyDataStatusConfirmedSelected:'Only data with process status of task to be confirmed can be selected',
}