diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue index 21e25ac6e..0e5775304 100644 --- a/src/modules/08_registryEmployee/views/Main.vue +++ b/src/modules/08_registryEmployee/views/Main.vue @@ -238,6 +238,12 @@ async function fetchList() { function onClickDelete(id: string) { dialogRemove($q, async () => { showLoader(); + queryParams.page = + queryParams.page !== 1 && + queryParams.page === maxPage.value && + rows.value.length === 1 + ? queryParams.page - 1 + : queryParams.page; await http .delete(config.API.registryNew("-employee") + `/${id}`) .then(async () => { diff --git a/src/modules/13_salary/components/04_salaryLists/TabMain.vue b/src/modules/13_salary/components/04_salaryLists/TabMain.vue index a1266e979..107e41543 100644 --- a/src/modules/13_salary/components/04_salaryLists/TabMain.vue +++ b/src/modules/13_salary/components/04_salaryLists/TabMain.vue @@ -255,9 +255,14 @@ function fetchDataQuota(id: string) { */ async function fetchDataPeriod(id: string) { showLoader(); - rows.value = []; + let formData = { - page: formFilter.page.toString(), + page: + formFilter.page !== 1 && + formFilter.page === maxPage.value && + rows.value.length === 1 + ? (formFilter.page - 1).toString() + : formFilter.page.toString(), pageSize: formFilter.pageSize.toString(), keyword: formFilter.keyword.trim(), type: store.tabType, @@ -268,6 +273,7 @@ async function fetchDataPeriod(id: string) { ? "1" : "0", }; + rows.value = []; await http .put(config.API.salaryListPeriodORG(id), formData) diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue b/src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue index 441c724c2..2ad3dcaa1 100644 --- a/src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue +++ b/src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue @@ -248,9 +248,13 @@ function fetchDataQuota(id: string) { */ async function fetchDataPeriod(id: string) { showLoader(); - rows.value = []; let formData = { - page: formFilter.page.toString(), + page: + formFilter.page !== 1 && + formFilter.page === maxPage.value && + rows.value.length === 1 + ? (formFilter.page - 1).toString() + : formFilter.page.toString(), pageSize: formFilter.pageSize.toString(), keyword: formFilter.keyword, type: store.tabType, @@ -261,6 +265,7 @@ async function fetchDataPeriod(id: string) { ? "1" : "0", }; + rows.value = []; await http .put(config.API.salaryListPeriodORGEmp(id), formData)