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":