From 2d10688e829a80e4040052f933b7fb0799af0242 Mon Sep 17 00:00:00 2001
From: assina045 <assina045@email.com>
Date: Sat, 6 May 2023 17:57:29 +0800
Subject: [PATCH] update affair management

---
 ui/src/components/ApproverApproved.vue    | 19 +++++++++++++++----
 ui/src/components/ApproverNotApproved.vue | 12 ++++++++++--
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/ui/src/components/ApproverApproved.vue b/ui/src/components/ApproverApproved.vue
index ac1844b..c4f9a99 100644
--- a/ui/src/components/ApproverApproved.vue
+++ b/ui/src/components/ApproverApproved.vue
@@ -28,10 +28,17 @@
 
         <el-table-column label="事务名称" prop="title" />
 
-        <el-table-column label="事务类型" prop="typeId" />
-
-        <el-table-column label="申请者" prop="applicantId" />
+        <el-table-column label="事务类型" prop="typeId">
+            <template #default="scope">
+                {{ scope.row.typeId === 1 ? '病假' : '事假' }}
+            </template>
+        </el-table-column>
 
+        <el-table-column label="申请者" prop="applicantId">
+            <template #default="scope">
+                {{ scope.row.applicantId === 1 ? 'ggb' : 'gzw' }}
+            </template>
+        </el-table-column>
         <el-table-column label="提交日期" prop="createTime">
             <template #default="scope">
                 {{ format(scope.row.createTime) }}
@@ -55,7 +62,11 @@
             </template>
         </el-table-column>
 
-        <el-table-column label="审批者" width="90" prop="inspectorId" />
+        <el-table-column label="审批结果" width="90" prop="status">
+            <template #default="scope">
+                {{ scope.row.status === 1 ? '同意' : '驳回' }}
+            </template>
+        </el-table-column>
     </el-table>
 
     <el-divider :data="labelData">
diff --git a/ui/src/components/ApproverNotApproved.vue b/ui/src/components/ApproverNotApproved.vue
index 8bb5387..23e6524 100644
--- a/ui/src/components/ApproverNotApproved.vue
+++ b/ui/src/components/ApproverNotApproved.vue
@@ -28,9 +28,17 @@
 
         <el-table-column label="事务名称" prop="title" />
 
-        <el-table-column label="事务类型" prop="typeId" />
+        <el-table-column label="事务类型" prop="typeId">
+            <template #default="scope">
+                {{ scope.row.typeId === 1 ? '病假' : '事假' }}
+            </template>
+        </el-table-column>
 
-        <el-table-column label="申请者" prop="applicantId" />
+        <el-table-column label="申请者" prop="applicantId">
+            <template #default="scope">
+                {{ scope.row.applicantId === 1 ? 'ggb' : 'gzw' }}
+            </template>
+        </el-table-column>
 
         <el-table-column label="日期" prop="createTime">
             <template #default="scope">