From 2b971ececd8546aa9331972ffde2f00b2378d680 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Thu, 21 Nov 2024 17:45:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/process/requestReport/index.vue | 14 +++++++++++---
 src/views/process/workReport/index.vue    | 15 +++++++++++----
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/views/process/requestReport/index.vue b/src/views/process/requestReport/index.vue
index bd8cd22..81d90a0 100644
--- a/src/views/process/requestReport/index.vue
+++ b/src/views/process/requestReport/index.vue
@@ -60,9 +60,9 @@
       <el-table-column label="姓名" align="center" prop="userName" width="80"/>
       <el-table-column label="职务" align="center" prop="postName" :show-overflow-tooltip="true" width="160">
       </el-table-column>
-      <el-table-column label="类型" align="center" prop="leaveType" :show-overflow-tooltip="true" width="150"/>
-      <el-table-column label="外出时间" align="center" prop="startDate" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="拟返回时间" align="center" prop="endDate" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="类型" align="center" prop="leaveType" :show-overflow-tooltip="true" width="130"/>
+      <el-table-column label="外出时间" align="center" prop="startDate" :show-overflow-tooltip="true" width="160"/>
+      <el-table-column label="拟返回时间" align="center" prop="endDate" :show-overflow-tooltip="true" width="160"/>
       <el-table-column label="地点" align="center" prop="location" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="事由" align="center" prop="leaveReason" :show-overflow-tooltip="true" width="80"/>
       <el-table-column label="是否请示领导同意" align="center" prop="isAgree" :show-overflow-tooltip="true" width="80">
@@ -75,6 +75,14 @@
         </el-table-column>
       <el-table-column label="代理主持工作人员" align="center" prop="hostUserId" :show-overflow-tooltip="true" width="150"/>
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" width="150"/>
+      <el-table-column label="审批状态" align="center" prop="examineStatus" width="100">
+        <template slot-scope="scope">
+          <span v-if="scope.row.examineStatus === '0'">待审核</span>
+          <span v-else-if="scope.row.examineStatus === '1'">已审核</span>
+          <span v-else ></span>
+          <!-- 可以添加更多的条件来处理其他可能的状态 -->
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding" >
         <template slot-scope="scope">
           <el-button
diff --git a/src/views/process/workReport/index.vue b/src/views/process/workReport/index.vue
index 7fbd146..859a40a 100644
--- a/src/views/process/workReport/index.vue
+++ b/src/views/process/workReport/index.vue
@@ -114,13 +114,20 @@
           </template>
         </el-table-column>
         <el-table-column label="姓名" align="center" prop="userName" width="90"/>
-        <el-table-column label="职务" align="center" prop="postName" :show-overflow-tooltip="true" width="180">
+        <el-table-column label="职务" align="center" prop="postName" :show-overflow-tooltip="true" width="170">
         </el-table-column>
         <el-table-column label="所属部门" align="center" prop="orgName" width="180"/>
-        <el-table-column label="申请时间" align="center" prop="createTime" width="180"/>
-        <el-table-column label="开始时间" align="center" prop="startDate" width="180"/>
-        <el-table-column label="结束时间" align="center" prop="endDate" width="180"/>
+        <el-table-column label="申请时间" align="center" prop="createTime" width="160"/>
+        <el-table-column label="开始时间" align="center" prop="startDate" width="160"/>
+        <el-table-column label="结束时间" align="center" prop="endDate" width="160"/>
         <el-table-column label="时长（天）" align="center" prop="leaveDuration" :show-overflow-tooltip="true" width="100"/>
+        <el-table-column label="审批状态" align="center" prop="examineStatus" width="100" v-if="tableDialogList.some(row => row.type === '轮休' || row.type === '外出办事')">
+          <template slot-scope="scope">
+            <span v-if="scope.row.examineStatus === '0'">待审核</span>
+            <span v-else-if="scope.row.examineStatus === '1'">已审核</span>
+            <!-- 可以添加更多的条件来处理其他可能的状态 -->
+          </template>
+        </el-table-column>
       </el-table>
       <pagination
         v-show="totalDialog>0"