From c03c679e1b99caa4aa5edd2dd22f3e9887c531f7 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Wed, 17 Jan 2024 16:58:49 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A2=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 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/modules/09_leave/stores/LeaveStore.ts b/src/modules/09_leave/stores/LeaveStore.ts
index a1639e442..9cd9c3cb8 100644
--- a/src/modules/09_leave/stores/LeaveStore.ts
+++ b/src/modules/09_leave/stores/LeaveStore.ts
@@ -59,14 +59,15 @@ export const useLeavelistDataStore = defineStore("leave", () => {
       level: e.level ?? "-",
       dateSendLeave: e.dateSendLeave && date2Thai(e.dateSendLeave),
       dateLeave:
-        e.dateSendLeave &&
-        date2Thai(e.dateSendLeave) + "-" + date2Thai(e.dateSendLeave),
+        e.leaveStartDate && e.leaveEndDate
+          ? e.leaveStartDate === e.leaveEndDate
+            ? date2Thai(e.leaveEndDate)
+            : date2Thai(e.leaveStartDate) + " - " + date2Thai(e.leaveEndDate)
+          : "-",
       status: e.status && convertSatatus(e.status),
     }));
-    console.log(datalist);
     mainData.value = datalist;
     rows.value = mainData.value;
-    console.log(mainData.value);
   }
 
   /**