From 75736702d06d577b336ac10ea594a667ddf52b69 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 12 三月 2026 15:40:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/views/personnelManagement/dimission/index.vue |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/personnelManagement/dimission/index.vue b/src/views/personnelManagement/dimission/index.vue
index ecbc369..5993b3f 100644
--- a/src/views/personnelManagement/dimission/index.vue
+++ b/src/views/personnelManagement/dimission/index.vue
@@ -18,7 +18,7 @@
       <div>
         <el-button type="primary" @click="openForm('add')">鏂板绂昏亴</el-button>
         <el-button @click="handleOut">瀵煎嚭</el-button>
-        <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
+        <!-- <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button> -->
       </div>
     </div>
     <div class="table_list">
@@ -44,7 +44,6 @@
 import FormDia from "@/views/personnelManagement/dimission/components/formDia.vue";
 import {findStaffLeaveListPage, batchDeleteStaffLeaves} from "@/api/personnelManagement/staffLeave.js";
 import {ElMessageBox} from "element-plus";
-import dayjs from "dayjs";
 
 const data = reactive({
   searchForm: {
@@ -77,6 +76,10 @@
     },
   },
   {
+    label: "绂昏亴鏃ユ湡",
+    prop: "leaveDate",
+  },
+  {
     label: "鍛樺伐缂栧彿",
     prop: "staffNo",
   },

--
Gitblit v1.9.3