diff --git a/src/modules/05_leave/store.ts b/src/modules/05_leave/store.ts
index ad81c0b..169abcc 100644
--- a/src/modules/05_leave/store.ts
+++ b/src/modules/05_leave/store.ts
@@ -45,7 +45,10 @@ export const useLeaveStore = defineStore("Leave", () => {
       dateLeave:
         e.leaveStartDate && e.leaveEndDate
           ? e.leaveStartDate === e.leaveEndDate
-            ? date2Thai(e.leaveEndDate)
+            ? e.leaveRange === "ALL"
+              ? date2Thai(e.leaveEndDate)
+              : date2Thai(e.leaveEndDate) +
+                ` (${converstType(e.leaveRangeEnd)})`
             : `${date2Thai(e.leaveStartDate)}${
                 e.leaveRange !== "ALL" ? ` (${converstType(e.leaveRange)})` : ""
               } - ${date2Thai(e.leaveEndDate)}${
@@ -63,6 +66,7 @@ export const useLeaveStore = defineStore("Leave", () => {
       isDelete: e.isDelete,
     }));
     rows.value = datalist;
+    console.log(datalist);
   }
 
   //ฟังก์ชั่นแปลง Status
@@ -143,14 +147,14 @@ export const useLeaveStore = defineStore("Leave", () => {
       case "LeaveTypeOption":
         update(() => {
           typeOptions.value = typeOptionsMain.value.filter(
-            (v: any) => v.name.indexOf(val) > -1
+            (v: any) => v.name.indexOf(val) > -1,
           );
         });
         break;
       case "LeaveStatusOption":
         update(() => {
           statusOptions.value = statusOptionsMain.value.filter(
-            (v: any) => v.name.indexOf(val) > -1
+            (v: any) => v.name.indexOf(val) > -1,
           );
         });
         break;