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

jero-web/src/common/lang/en-us.js

@@ -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',
 }

jero-web/src/common/lang/zh-cn.js

@@ -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:'待办中心',
 }