From a6acb7ea0d3cf7ef39de1a51a2293830b69d8434 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sun, 27 Oct 2024 11:09:03 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/ApproveController.php         | 10 ++++++----
 .../DialogView/template/approve-comment-notifier.vue   |  2 +-
 .../DialogView/template/approve-notifier.vue           |  2 +-
 .../DialogView/template/approve-reviewer.vue           |  2 +-
 .../DialogView/template/approve-submitter.vue          |  2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Api/ApproveController.php b/app/Http/Controllers/Api/ApproveController.php
index 44a5ff93a..d5de64222 100755
--- a/app/Http/Controllers/Api/ApproveController.php
+++ b/app/Http/Controllers/Api/ApproveController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Api;
 
+use App\Module\Doo;
 use Request;
 use Session;
 use Response;
@@ -992,11 +993,12 @@ class ApproveController extends AbstractController
             'is_finished' => $process['is_finished'],
             'data' => $data
         ];
+        $procDefName = Doo::translate($data['proc_def_name']);
         $msgData['title'] = match ($type) {
-            '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']} 拒绝",
+            'approve_reviewer' => $data['nickname'] . " 提交的「{$procDefName}」待你审批",
+            'approve_notifier' => "抄送 {$data['nickname']} 提交的「{$procDefName}」记录",
+            'approve_comment_notifier' => $data['comment_nickname'] . " 评论了 {$data['nickname']} 的「{$procDefName}」审批",
+            'approve_submitter' => $action == 'pass' ? "您发起的「{$procDefName}」已通过" : "您发起的「{$procDefName}」被 {$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 ac74b202e..2835e9da1 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 @@
 <template>
     <div class="open-approve-details" :data-id="msg.data.id">
-        <b>{{ $L(`${msg.data.comment_nickname} 评论了 ${msg.data.nickname} 的「${msg.data.proc_def_name}」审批`) }}</b>
+        <b>{{ $L(`${msg.data.comment_nickname} 评论了 ${msg.data.nickname} 的「${$L(msg.data.proc_def_name)}」审批`) }}</b>
         <div class="cause">
             <p>{{$L('申请人')}}：<span class="mark-color">@{{ msg.data.nickname }}</span> {{ msg.data.department }}</p>
             <b>{{$L('评论内容')}}</b>
diff --git a/resources/assets/js/pages/manage/components/DialogView/template/approve-notifier.vue b/resources/assets/js/pages/manage/components/DialogView/template/approve-notifier.vue
index 32f6c17c9..6dbd663c0 100644
--- a/resources/assets/js/pages/manage/components/DialogView/template/approve-notifier.vue
+++ b/resources/assets/js/pages/manage/components/DialogView/template/approve-notifier.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="open-approve-details" :data-id="msg.data.id">
-        <b>{{ $L(`抄送 ${msg.data.nickname} 提交的「${msg.data.proc_def_name}」记录`) }}</b>
+        <b>{{ $L(`抄送 ${msg.data.nickname} 提交的「${$L(msg.data.proc_def_name)}」记录`) }}</b>
         <div class="cause">
             <p>{{$L("申请人")}}：<span class="mark-color">@{{ msg.data.nickname }}</span> {{ msg.data.department }}</p>
             <b>{{$L("详情")}}</b>
diff --git a/resources/assets/js/pages/manage/components/DialogView/template/approve-reviewer.vue b/resources/assets/js/pages/manage/components/DialogView/template/approve-reviewer.vue
index 756e051f1..6b4698838 100644
--- a/resources/assets/js/pages/manage/components/DialogView/template/approve-reviewer.vue
+++ b/resources/assets/js/pages/manage/components/DialogView/template/approve-reviewer.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="open-approve-details" :data-id="msg.data.id">
-        <b>{{ $L(`${msg.data.nickname} 提交的「${msg.data.proc_def_name}」待你审批`) }}</b>
+        <b>{{ $L(`${msg.data.nickname} 提交的「${$L(msg.data.proc_def_name)}」待你审批`) }}</b>
         <div class="cause">
             <p>{{$L("申请人")}}：<span class="mark-color">@{{ msg.data.nickname }}</span> {{ msg.data.department }}</p>
             <b>{{$L("详情")}}</b>
diff --git a/resources/assets/js/pages/manage/components/DialogView/template/approve-submitter.vue b/resources/assets/js/pages/manage/components/DialogView/template/approve-submitter.vue
index 585ff56f8..8349feddd 100644
--- a/resources/assets/js/pages/manage/components/DialogView/template/approve-submitter.vue
+++ b/resources/assets/js/pages/manage/components/DialogView/template/approve-submitter.vue
@@ -27,7 +27,7 @@ export default {
     },
     computed: {
         title({msg}) {
-            return msg.action === 'pass' ? `您发起的「${msg.data.proc_def_name}」已通过` : `您发起的「${msg.data.proc_def_name}」被 ${msg.data.nickname} 拒绝`
+            return msg.action === 'pass' ? `您发起的「${this.$L(msg.data.proc_def_name)}」已通过` : `您发起的「${this.$L(msg.data.proc_def_name)}」被 ${msg.data.nickname} 拒绝`
         }
     },
     methods: {},