Merge branch 'nice_dev' into develop

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-10-02 09:44:47 +07:00
commit 17c62fae53

View file

@ -76,6 +76,7 @@ const yearOptions = ref<any>([{ id: "", year: "ทั้งหมด" }]);
onMounted(async () => {
await fetchRetirement(type.value, currentYear);
// fiscalyear.value = currentYear + 543
// await fetchRetirement(type.value, currentYear);
});
//
@ -116,7 +117,11 @@ const fetchRetirement = async (type: string, year: any) => {
yearOptions.value.push(...option);
yearOptionsFilter.value = yearOptions.value;
if (yearOptionsFilter.value.length == 1) {
fiscalyear.value = yearOptionsFilter.value[0].id;
} else {
fiscalyear.value = year;
}
actionOption.value = rows.value;
rows.value.sort((a, b) => a.round - b.round); //
checkststus(rows.value);