Compare commits
No commits in common. "b0dc2aa44932c42b21b6ad978084e2c2bd98f0d1" and "72d0989fcc9f91bf71525f28fd12604962846355" have entirely different histories.
b0dc2aa449
...
72d0989fcc
1 changed files with 3 additions and 7 deletions
|
|
@ -45,10 +45,7 @@ export const useLeaveStore = defineStore("Leave", () => {
|
|||
dateLeave:
|
||||
e.leaveStartDate && e.leaveEndDate
|
||||
? e.leaveStartDate === e.leaveEndDate
|
||||
? e.leaveRange === "ALL"
|
||||
? date2Thai(e.leaveEndDate)
|
||||
: date2Thai(e.leaveEndDate) +
|
||||
` (${converstType(e.leaveRangeEnd)})`
|
||||
? date2Thai(e.leaveEndDate)
|
||||
: `${date2Thai(e.leaveStartDate)}${
|
||||
e.leaveRange !== "ALL" ? ` (${converstType(e.leaveRange)})` : ""
|
||||
} - ${date2Thai(e.leaveEndDate)}${
|
||||
|
|
@ -66,7 +63,6 @@ export const useLeaveStore = defineStore("Leave", () => {
|
|||
isDelete: e.isDelete,
|
||||
}));
|
||||
rows.value = datalist;
|
||||
console.log(datalist);
|
||||
}
|
||||
|
||||
//ฟังก์ชั่นแปลง Status
|
||||
|
|
@ -147,14 +143,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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue