From 0ffa431fcb32067ac50077f6707b15ff6e17d159 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 7 Jul 2025 17:04:11 +0700
Subject: [PATCH] =?UTF-8?q?fix=20page=20=3D=3D>=20=20=E0=B8=A3=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9C=E0=B8=B1=E0=B8=87?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=B1=E0=B8=8D=E0=B8=8A=E0=B8=B5=E0=B9=80=E0=B8=87?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/13_salary/views/01_salaryMain.vue | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

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()"
           ></q-pagination>
         </template>
       </d-table>