From c13fe9d5907f48894f4248417b8875c90289827e Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Tue, 11 Feb 2025 03:25:22 +0900
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/pages/manage/approve/index.vue       | 2 +-
 resources/assets/js/pages/manage/approve/list.vue        | 2 +-
 .../components/DialogView/template/approve-notifier.vue  | 2 +-
 .../components/DialogView/template/approve-reviewer.vue  | 6 +++---
 .../components/DialogView/template/approve-submitter.vue | 6 +++---
 .../assets/sass/pages/components/dialog-wrapper.scss     | 9 +++++++++
 6 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/resources/assets/js/pages/manage/approve/index.vue b/resources/assets/js/pages/manage/approve/index.vue
index 1ee771ae8..c0e613903 100644
--- a/resources/assets/js/pages/manage/approve/index.vue
+++ b/resources/assets/js/pages/manage/approve/index.vue
@@ -183,7 +183,7 @@
                         <Option v-for="(item, index) in procdefList" :value="item.name" :key="index">{{ $L(item.name) }}</Option>
                     </Select>
                 </FormItem>
-                <FormItem v-if="(addData.applyType || '').indexOf('请假') !== -1" prop="type" :label="$L('假期类型')">
+                <FormItem v-if="$A.strExists(addData.applyType, '请假')" prop="type" :label="$L('假期类型')">
                     <Select v-model="addData.type" :placeholder="$L('请选择假期类型')">
                         <Option v-for="(item, index) in selectTypes" :value="item" :key="index">{{ $L(item) }}</Option>
                     </Select>
diff --git a/resources/assets/js/pages/manage/approve/list.vue b/resources/assets/js/pages/manage/approve/list.vue
index 231faec55..1cc73f687 100644
--- a/resources/assets/js/pages/manage/approve/list.vue
+++ b/resources/assets/js/pages/manage/approve/list.vue
@@ -8,7 +8,7 @@
             <Tag v-if="data.state == 3" color="red">{{$L('已拒绝')}}</Tag>
             <Tag v-if="data.state == 4" color="red">{{$L('已撤回')}}</Tag>
         </h2>
-        <p v-if="data.var?.type">{{$L('假期类型')}}：<span>{{$L(data.var?.type)}}</span></p>
+        <p v-if="$A.strExists(data.proc_def_name, '请假') && data.var?.type">{{$L('假期类型')}}：<span>{{$L(data.var?.type)}}</span></p>
         <p>{{$L('开始时间')}}：<span>{{data.var?.start_time}}</span></p>
         <p>{{$L('结束时间')}}：<span>{{data.var?.end_time}}</span></p>
         <div class="list-member">
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 960befb43..cd7e30fb6 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
@@ -4,7 +4,7 @@
         <div class="cause">
             <p>{{$L("申请人")}}：<span class="mark-color">@{{ msg.data.nickname }}</span> {{ msg.data.department }}</p>
             <b>{{$L("详情")}}</b>
-            <p v-if="msg.data.type">{{$L("假期类型")}}：{{ $L(msg.data.type) }}</p>
+            <p v-if="$A.strExists(msg.data.proc_def_name, '请假') && msg.data.type">{{$L("假期类型")}}：{{ $L(msg.data.type) }}</p>
             <p>{{$L("开始时间")}}：{{ msg.data.start_time }} ({{ $L(msg.data.start_day_of_week) }})</p>
             <p>{{$L("结束时间")}}：{{ msg.data.end_time }} ({{ $L(msg.data.end_day_of_week) }})</p>
             <p>{{$L("事由")}}：{{ msg.data.description }}</p>
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 c0a3f4579..f11ff884b 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
@@ -4,7 +4,7 @@
         <div class="cause">
             <p>{{$L("申请人")}}：<span class="mark-color">@{{ msg.data.nickname }}</span> {{ msg.data.department }}</p>
             <b>{{$L("详情")}}</b>
-            <p v-if="msg.data.type">{{$L("假期类型")}}：{{ $L(msg.data.type) }}</p>
+            <p v-if="$A.strExists(msg.data.proc_def_name, '请假') && msg.data.type">{{$L("假期类型")}}：{{ $L(msg.data.type) }}</p>
             <p>{{$L("开始时间")}}：{{ msg.data.start_time }} ({{ $L(msg.data.start_day_of_week) }})</p>
             <p>{{$L("结束时间")}}：{{ msg.data.end_time }} ({{ $L(msg.data.end_day_of_week) }})</p>
             <p>{{$L("事由")}}：{{ msg.data.description }}</p>
@@ -12,8 +12,8 @@
         </div>
         <div class="btn-raw no-dark-content">
             <button v-if="msg.action === 'pass'" class="ivu-btn ivu-btn-grey">{{$L("已同意")}}</button>
-            <button v-else-if="msg.action === 'refuse'" class="ivu-btn ivu-btn-grey">{{$L("已拒绝")}}</button>
-            <button v-else-if="msg.action === 'withdraw'" class="ivu-btn ivu-btn-grey">{{$L("已撤销")}}</button>
+            <button v-else-if="msg.action === 'refuse'" class="ivu-btn ivu-btn-grey rejected">{{$L("已拒绝")}}</button>
+            <button v-else-if="msg.action === 'withdraw'" class="ivu-btn ivu-btn-grey revoked">{{$L("已撤销")}}</button>
             <template v-else>
                 <button class="ivu-btn ivu-btn-primary">{{$L("同意")}}</button>
                 <button class="ivu-btn ivu-btn-error">{{$L("拒绝")}}</button>
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 78c2b9572..3f71f1413 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
@@ -4,15 +4,15 @@
         <div class="cause">
             <p>{{$L("申请人")}}：<span class="mark-color">@{{ msg.data.start_nickname }}</span> {{ msg.data.department }}</p>
             <b>{{$L("详情")}}</b>
-            <p v-if="msg.data.type">{{$L("假期类型")}}：{{ $L(msg.data.type) }}</p>
+            <p v-if="$A.strExists(msg.data.proc_def_name, '请假') && msg.data.type">{{$L("假期类型")}}：{{ $L(msg.data.type) }}</p>
             <p>{{$L("开始时间")}}：{{ msg.data.start_time }} ({{ $L(msg.data.start_day_of_week) }})</p>
             <p>{{$L("结束时间")}}：{{ msg.data.end_time }} ({{ $L(msg.data.end_day_of_week) }})</p>
             <p>{{$L("事由")}}：{{ msg.data.description }}</p>
         </div>
         <div class="btn-raw no-dark-content">
             <button v-if="msg.action === 'pass'" class="ivu-btn ivu-btn-grey">{{$L("已同意")}}</button>
-            <button v-else-if="msg.action === 'refuse'" class="ivu-btn ivu-btn-grey">{{$L("已拒绝")}}</button>
-            <button v-else-if="msg.action === 'withdraw'" class="ivu-btn ivu-btn-grey">{{$L("已撤销")}}</button>
+            <button v-else-if="msg.action === 'refuse'" class="ivu-btn ivu-btn-grey rejected">{{$L("已拒绝")}}</button>
+            <button v-else-if="msg.action === 'withdraw'" class="ivu-btn ivu-btn-grey revoked">{{$L("已撤销")}}</button>
         </div>
     </div>
 </template>
diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss
index 79e2b7d65..8d87d9fc9 100644
--- a/resources/assets/sass/pages/components/dialog-wrapper.scss
+++ b/resources/assets/sass/pages/components/dialog-wrapper.scss
@@ -1389,6 +1389,15 @@
                                 width: 300px;
                             }
 
+                            .ivu-btn-grey {
+                                &.rejected {
+                                    color: #ff0000;
+                                }
+                                &.revoked {
+                                    color: #9b9b9b;
+                                }
+                            }
+
                             .cause {
                                 border-bottom: 1px solid #e3e3e3;
                                 border-top: 1px solid #e3e3e3;