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
2023-03-09 17:55:55 +08:00
parent de3fcf580b efdd04d5d9
commit bed9482353
3 changed files with 118 additions and 22 deletions
@@ -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',
 }