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

@@ -1108,8 +1108,9 @@ module.exports = {
   requiredParametersEmpty: 'Required parameters cannot be empty',
   PleaseTaskConfirmationRejected: 'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected',
   theProjectContactEmpty: 'The project contact person of cannot be empty',
-  pleaseSelectinitiatedOrRejected: 'Please select the data whose list confirmation status is not initiated or rejected',
-  TheEngineerAndCertification: 'The regulatory engineer and Certification Engineer of cannot be empty',
+  pleaseSelectinitiatedOrRejected: 'Please select the data whose design compliance confirmation process status is List to be Published or whose verification compliance confirmation process status is List to be Published',
+  TheEngineerAndCertification: 'The regulatory engineer of cannot be empty',
+  pleaseSelectTheDataverificationVerified:'Please select the data whose design compliance confirmation process status is List to Be Checked or whose verification compliance confirmation process status is List to Be Checked',
   theResponsiblePersonAndDeadlineClank: 'The responsible person and deadline of cannot be blank',
   bringInTheProjectInterface: 'Assign to Owner',
   theCurrentListSaved: 'The current list data has been submitted and cannot be temporarily saved',
@@ -1511,12 +1512,6 @@ module.exports = {
   dateofproduction:'Date of production',
   VINcodelist:'VIN code list',
   VINcodeupload:'VIN code upload',
-  recordmaintenance:'Record maintenance',
-  upgradecompletion:'Upgrade completion',
-  implementedupgrade:'Whether the implemented upgrade is consistent with the record',
-  numberofvehicles:'Number of vehicles that have completed upgrades',
-  vehicleshavenotcompletedonlineupgrade:'The reason why some vehicles have not completed online upgrade',
-  implementationrecords:'Fault handling measures and emergency response implementation records',
   Tasknode:'Task Node',
   Taskresponsibilityrecognition:'Task responsibility recognition',
   uploadattachment:'Upload attachment',
@@ -1658,4 +1653,11 @@ module.exports = {
   upgradeplanexpirationtime:'Upgrade plan expiration time',
 
 
+  resultofhandling:'Result of handling',
+  Listoftreatableregulations:'List of treatable regulations',
+  Listofuntractableregulations:'List of untractable regulations',
+  project:'Project',
+  Categoryofdeliverables:'Category of deliverables',
+  Taskconfirmationresult:'Task confirmation result',
+  Compliancetaskhandling:'Compliance task handling'
 }

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

@@ -703,8 +703,9 @@ module.exports = {
   listConfirmation: '清单确认',
   ListConfirmationDeadline: '清单确认截止时间',
   dataConfirmation: '请选择清单确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空',
-  pleaseSelectinitiatedOrRejected: '请选择清单确认状态为未发起或拒绝的数据',
-  TheEngineerAndCertification: '的法规工程师、认证工程师不能为空',
+  pleaseSelectinitiatedOrRejected: '请选择设计符合性确认流程状态为清单待发布或验证符合性确认流程状态为清单待发布的数据',
+  pleaseSelectTheDataverificationVerified:'请选择设计符合性确认流程状态为清单待校核或验证符合性确认流程状态为清单待校核的数据',
+  TheEngineerAndCertification: '的法规工程师不能为空',
   taskDataConfirmation: '请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据,以及工程接口人不为空',
   theProjectContactEmpty: '的工程接口人不能为空',
   PleaseTaskConfirmationRejected: '请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据',
@@ -1613,18 +1614,18 @@ module.exports = {
   dateofproduction:'生产日期',
   VINcodelist:'VIN码清单',
   VINcodeupload:'VIN码上传',
-  recordmaintenance:'备案维护',
-  upgradecompletion:'升级完成情况',
-  implementedupgrade:'实施的升级是否和备案一致',
-  numberofvehicles:'完成升级的车辆数',
-  vehicleshavenotcompletedonlineupgrade:'部分车辆未完在线升级的原因',
-  implementationrecords:'故障处置措施和应急响应实施记录',
-  cause:'原因',
   Tasknode:'任务节点',
   Taskresponsibilityrecognition:'任务责任确认',
   uploadattachment:'上传附件',
   Processhistory:'流程历史',
   resultofhandling:'处理结果',
+  Listoftreatableregulations:'可处理法规列表',
+  Listofuntractableregulations:'不可处理法规列表',
+  project:'项目',
+  Categoryofdeliverables:"交付物类别",
+  Taskconfirmationresult:'任务确认结果',
+  Compliancetaskhandling:'符合性任务办理'
+  resultofhandling:'处理结果',
   networksecurityrequirements:'网络安全要求',
   upgradefunctionrequirements:'升级功能要求',
   usernotificationrequirement:'用户告知要求',