Merge branch 'master' into 'dev_third_stage'

# Conflicts:
#   jero-web/src/common/lang/zh-cn.js
#   jero-web/src/views/projectManagement/components/listOfRegulations.vue

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

@@ -569,6 +569,8 @@ module.exports = {
   mergeTerms: 'Determine Merger Terms',
   documentSplitTemplate: 'Document Split Template',
   batSetting: 'Batch Setting',
+  batchSettingInformation:'Batch Setting Information',
+  batchSettingPersonnel:'Batch Setting Personnel',
   selectDirectoryTerms: 'Please Select the directory location to add terms',
   StandardBreakdown: 'Standard Breakdown',
   OnlyWordItem: 'Only the GSO file type can split PDF files. Please re select the file',
@@ -713,9 +715,9 @@ module.exports = {
 
   confirmationOfRegulationsList: 'Regulation List Confirmation',
   regulatoryTaskConfirmation: 'Regulation Task Confirmation',
-  certificationStart: 'Homo Test Completion',
-  preHomoCompletion: 'Pre-Homo Completion',
-  certificationEnd: 'Type Approval',
+  certificationStart: 'Homo Completion',
+  preHomoCompletion: 'Pre-Homo Confirmation',
+  certificationEnd: 'Homo KO',
   directoryName: 'Catalogue Name',
   batch: 'Batch',
   uploadTime: 'Upload Time',
@@ -1269,6 +1271,10 @@ module.exports = {
   source:'Source',
   sourceEn:'Source (English)',
   onlyone:'Only one merge delimiter can be entered',
+  theInconsistentSameResponsibility:'The selected data responsibility fields are inconsistent; Please select the same responsibility',
+  taskConfirmedPersonnelCannotBeSetBatch:'When the task confirmation status is to be confirmed, personnel cannot be set in batch',
+  theSelectedDataResponsibilityFieldCannotEmpty:'The selected data responsibility field cannot be empty',
+  theTaskConfirmationStatusCannot:'Only the list confirmation status is "reject" or "accept" and the task confirmation status cannot be "data to be confirmed"',
   BatchMaintenanceProgress:'Batch Maintenance Progress',
   BatchChangeStatus:'Batch Change Status',
   CollectinguthenticationParameters:'Collecting Authentication Parameters',

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

@@ -576,6 +576,8 @@ module.exports = {
   mergeTerms: '确定合并条款',
   documentSplitTemplate: '文档拆分模板',
   batSetting: '批量设置',
+  batchSettingInformation:'批量设置信息',
+  batchSettingPersonnel:'批量设置人员',
   selectDirectoryTerms: '请选择添加条款的目录位置',
   selectDirectorylocation: '请选择添加文件夹的目录位置',
   OnlyWordItem: '只有GSO文件类型，才能拆分pdf文件，请重新选择文件',
@@ -1371,6 +1373,10 @@ module.exports = {
   source: '来源',
   sourceEn: '来源(英文)',
   onlyone:'只能输入一个合并分隔符',
+  theInconsistentSameResponsibility:'所选的数据责任领域不一致；请选择相同的责任领域',
+  taskConfirmedPersonnelCannotBeSetBatch:'任务确认状态为待确认时无法批量设置人员',
+  theSelectedDataResponsibilityFieldCannotEmpty:'所选数据责任领域不能为空',
+  theTaskConfirmationStatusCannot:'只能变更清单确认状态为拒绝或接受、及任务确认状态不能为待确认的数据',
   BatchMaintenanceProgress:'批量维护进度',
   BatchChangeStatus:'批量修改状态',
   CollectinguthenticationParameters:'认证参数收集',