diff --git a/src/modules/09_leave/stores/LeaveStore.ts b/src/modules/09_leave/stores/LeaveStore.ts index 7bfaeb85f..9bf2d6f30 100644 --- a/src/modules/09_leave/stores/LeaveStore.ts +++ b/src/modules/09_leave/stores/LeaveStore.ts @@ -74,7 +74,10 @@ export const useLeavelistDataStore = 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)}${