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); } /**