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
@@ -906,7 +906,9 @@ module.exports = {
pleaseConfirmedByPrehomo: '请补全 Pre-Homo确认的数据',
pleaseConformityVerification: '请补全验证符合性确认的数据',
virtualListDetails: '虚拟清单详情',
virtualAuthenticationListDetails: '虚拟认证清单详情',
maintainVirtualList: '维护虚拟清单',
certificationListMaintenance: '认证清单维护',
reasonsForRejection: '驳回原因',
inconformity: '不符合',
toTrack: '待追踪',
@@ -1505,6 +1507,14 @@ module.exports = {
missionRejection:'任务拒绝',
turnToDo:'转办',
initiateTask:'发起任务',
areYouReturnToStudio:'确认退回至studio吗?',
confirmLaunchTask:'确认发起任务?',
conditionsNotMet:'不满足条件',
onlyProcessStatusReturned:'只能退回流程状态为清单待校核和责任人拒绝的数据',
onlyProcessReturned:'只能发起流程状态为清单待校核和责任人拒绝的数据',
confirmToAcceptTheTask:'确认接受任务?',
confirmRejectTask:'确认拒绝任务?',
onlyDataStatusConfirmedSelected:'只能选择流程状态为任务待确认的数据',
compliancereport:'生成合规报告',
todocenter:'待办中心',
}