updated ระบบลา

This commit is contained in:
Warunee Tamkoo 2025-04-29 22:07:31 +07:00
parent cab7450748
commit e4cb83a9b3
6 changed files with 51 additions and 28 deletions

View file

@ -89,8 +89,9 @@ async function fetchDataCalendar(type: string) {
];
filterLists.value = [];
for (let i = 1; i <= double_name.length; i++) {
const name = double_name[i - 1];
for (let i = 0; i < double_name.length; i++) {
const name = double_name[i];
const filterName = {
id: name,
name: convertKeycloakId(name),
@ -98,7 +99,9 @@ async function fetchDataCalendar(type: string) {
};
filterLists.value.push(filterName);
type === "onMounted" && filterVal.value.push(name);
if (type === "onMounted") {
filterVal.value.push(name);
}
}
const eventData = filterVal.value.map((item: any) => {
return mainData.value
@ -115,7 +118,7 @@ async function fetchDataCalendar(type: string) {
});
const allEventData = [].concat(...eventData);
calendarOptions.value.events = allEventData;
await fetchDataHoliday(calendarOptions.value.events);
fetchDataHoliday(calendarOptions.value.events);
})
.catch((err) => {
@ -141,8 +144,6 @@ async function fetchDataHoliday(optionsCalendaMain: any) {
)
)
.then((res) => {
console.log(res);
const dataNormal = res.data.result.normal;
const data = dataNormal;
const event = data.map((e: any) => ({
@ -220,6 +221,7 @@ watch(
onMounted(async () => {
const user = await tokenParsed();
keycloakId.value = user?.sub;
leaveStore.leaveTypeList();
await fetchDataCalendar("onMounted");
});
</script>