hrms-bangkok/hrms-user
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m13s
Details

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2026-01-19 11:15:15 +07:00
commit b0dc2aa449
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/05_leave/store.ts
View file

@ -45,7 +45,10 @@ export const useLeaveStore = defineStore("Leave", () => {
dateLeave: dateLeave:
e.leaveStartDate && e.leaveEndDate e.leaveStartDate && e.leaveEndDate
? 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)}${ : `${date2Thai(e.leaveStartDate)}${
e.leaveRange !== "ALL" ? ` (${converstType(e.leaveRange)})` : "" e.leaveRange !== "ALL" ? ` (${converstType(e.leaveRange)})` : ""
} - ${date2Thai(e.leaveEndDate)}${ } - ${date2Thai(e.leaveEndDate)}${
@ -63,6 +66,7 @@ export const useLeaveStore = defineStore("Leave", () => {
isDelete: e.isDelete, isDelete: e.isDelete,
})); }));
rows.value = datalist; rows.value = datalist;
console.log(datalist);
} }
//ฟังก์ชั่นแปลง Status //ฟังก์ชั่นแปลง Status
@ -143,14 +147,14 @@ export const useLeaveStore = defineStore("Leave", () => {
case "LeaveTypeOption": case "LeaveTypeOption":
update(() => { update(() => {
typeOptions.value = typeOptionsMain.value.filter( typeOptions.value = typeOptionsMain.value.filter(
(v: any) => v.name.indexOf(val) > -1 (v: any) => v.name.indexOf(val) > -1,
); );
}); });
break; break;
case "LeaveStatusOption": case "LeaveStatusOption":
update(() => { update(() => {
statusOptions.value = statusOptionsMain.value.filter( statusOptions.value = statusOptionsMain.value.filter(
(v: any) => v.name.indexOf(val) > -1 (v: any) => v.name.indexOf(val) > -1,
); );
}); });
break; break;