diff --git a/app/Http/Controllers/Api/ApproveController.php b/app/Http/Controllers/Api/ApproveController.php index 6d8c804fb..44a5ff93a 100755 --- a/app/Http/Controllers/Api/ApproveController.php +++ b/app/Http/Controllers/Api/ApproveController.php @@ -993,10 +993,10 @@ class ApproveController extends AbstractController 'data' => $data ]; $msgData['title'] = match ($type) { - 'approve_reviewer' => '待你审批', - 'approve_notifier' => '审批通知', - 'approve_comment_notifier' => '审批评论通知', - 'approve_submitter' => '审批结果', + 'approve_reviewer' => $data['nickname'] . " 提交的「{$data['proc_def_name']}」待你审批", + 'approve_notifier' => "抄送 {$data['nickname']} 提交的「{$data['proc_def_name']}」记录", + 'approve_comment_notifier' => $data['comment_nickname'] . " 评论了 {$data['nickname']} 的「{$data['proc_def_name']}」审批", + 'approve_submitter' => $action == 'pass' ? "您发起的「{$data['proc_def_name']}」已通过" : "您发起的「{$data['proc_def_name']}」被 {$data['nickname']} 拒绝", default => '不支持的指令', }; if ($action == 'withdraw' || $action == 'pass' || $action == 'refuse') { diff --git a/resources/assets/js/pages/manage/components/DialogView/template/approve-comment-notifier.vue b/resources/assets/js/pages/manage/components/DialogView/template/approve-comment-notifier.vue index c38140eff..ac74b202e 100644 --- a/resources/assets/js/pages/manage/components/DialogView/template/approve-comment-notifier.vue +++ b/resources/assets/js/pages/manage/components/DialogView/template/approve-comment-notifier.vue @@ -1,6 +1,6 @@