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/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:'用户告知要求',