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 15:36:57 +08:00
parent 64be4e542d f5d71a952a
commit 439d10e1c6
9 changed files with 260 additions and 18 deletions
@@ -1424,6 +1424,8 @@ module.exports = {
  onlyDataStatusResultReviewedCanBeSelected:'Only data with process status of result to be reviewed can be selected',
  confirmResetProcess:'Confirm reset process?',
  confirmUrging:'Confirm urging ?',
+  confirmWithdrawal:'Confirm withdrawal ?',
+  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 ?',
 }
@@ -1527,4 +1527,7 @@ module.exports = {
  confirmUrging:'确认催办',
  statusthetasistobeconfirmed:'只有清单待校核状态或任务确认状态为待确认时才可以进行撤回',
  confirmreturn:'确认退回？',
+  confirmUrging:'确认催办?',
+  confirmWithdrawal:'确认撤回?',
+  onlyListCheckedCanRecalled:'只能撤回流程状态为清单待校核的数据',
 }