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

@@ -1428,5 +1428,7 @@ module.exports = {
   onlyListCheckedCanRecalled:'Only the data whose process status is list to be checked can be recalled',
   statusthetasistobeconfirmed:'You can withdraw the list only when the status of the list is to be checked or the status of the task is to be confirmed',
   confirmreturn:'Confirm return ?',
+  onlyDataSelected:'Only data with process status of task to be confirmed, result to be submitted and review to be returned can be selected',
+  youCannotStatusListToBeReleasedAndApproved:'You cannot select data whose process status is list to be released and approved',
   batchmodify:'Whether to batch modify',
 }

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

@@ -1530,5 +1530,7 @@ module.exports = {
   confirmUrging:'确认催办?',
   confirmWithdrawal:'确认撤回?',
   onlyListCheckedCanRecalled:'只能撤回流程状态为清单待校核的数据',
+  onlyDataSelected:'只能选择流程状态为任务待确认、结果待提交、审查退回的数据',
+  youCannotStatusListToBeReleasedAndApproved:'不能选择流程状态为清单待发布、审查通过的数据',
   batchmodify:'是否批量修改',
 }