diff --git a/src/modules/13_salary/views/01_salaryMain.vue b/src/modules/13_salary/views/01_salaryMain.vue index 94db2813a..114a110ad 100644 --- a/src/modules/13_salary/views/01_salaryMain.vue +++ b/src/modules/13_salary/views/01_salaryMain.vue @@ -171,9 +171,15 @@ function onClickCoppy(id: string) { * @param id บัญชีเงินเดือน */ function onClickDelete(id: string) { - dialogRemove($q, () => { + dialogRemove($q, async () => { showLoader(); - http + formQuery.page = + formQuery.page !== 1 && + formQuery.page === maxPage.value && + rows.value.length === 1 + ? formQuery.page - 1 + : formQuery.page; + await http .delete(config.API.salaryChartByid(id)) .then(async () => { await fetchListSalaly(); @@ -218,11 +224,14 @@ function filterFn(page: number) { } /** - * callbackFunction ทำงานเมื่อมีการ เปลี่ยนหน้าหรือ แถว + * callbackFunction ทำงานเมื่อมีการ เปลี่ยนแถว */ -watch([() => formQuery.page, () => formQuery.pageSize], () => { - fetchListSalaly(); -}); +watch( + () => formQuery.pageSize, + () => { + fetchListSalaly(); + } +); /** hooklifecycle*/ onMounted(() => { @@ -483,6 +492,7 @@ onMounted(() => { boundary-links direction-links :max-pages="5" + @update:model-value="fetchListSalaly()" >