From 909ab19ca898f032f6641ed8cd99ec87c68edb9c Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Tue, 29 Apr 2025 15:12:32 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=AA=E0=B8=96=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=99=E0=B8=B0=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A5=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/09_leave/stores/LeaveStore.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/modules/09_leave/stores/LeaveStore.ts b/src/modules/09_leave/stores/LeaveStore.ts
index b1c006684..781aba60d 100644
--- a/src/modules/09_leave/stores/LeaveStore.ts
+++ b/src/modules/09_leave/stores/LeaveStore.ts
@@ -68,7 +68,13 @@ export const useLeavelistDataStore = defineStore("leave", () => {
         e.leaveStartDate && e.leaveEndDate
           ? e.leaveStartDate === e.leaveEndDate
             ? date2Thai(e.leaveEndDate)
-            : `${date2Thai(e.leaveStartDate)}${e.leaveRange !== 'ALL' ? ` (${converstType(e.leaveRange)})`:''} - ${date2Thai(e.leaveEndDate)}${e.leaveRangeEnd !== 'ALL' ? ` (${converstType(e.leaveRangeEnd)})`:''}`
+            : `${date2Thai(e.leaveStartDate)}${
+                e.leaveRange !== "ALL" ? ` (${converstType(e.leaveRange)})` : ""
+              } - ${date2Thai(e.leaveEndDate)}${
+                e.leaveRangeEnd !== "ALL"
+                  ? ` (${converstType(e.leaveRangeEnd)})`
+                  : ""
+              }`
           : "-",
       status: e.status && convertSatatus(e.status),
     }));
@@ -116,7 +122,7 @@ export const useLeavelistDataStore = defineStore("leave", () => {
       case "NEW":
         return "ใหม่";
       case "PENDING":
-        return "อยู่ระหว่างดำเนินการ";
+        return "กำลังดำเนินการ";
       case "APPROVE":
         return "อนุญาต";
       case "REJECT":