From bb0e6a69bf4680c78c8743f6be69d78de45533cf Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 19 Apr 2024 15:31:12 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=AD=E0=B8=B1=E0=B8=95=E0=B8=A3=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B3=E0=B8=A5=E0=B8=B1=E0=B8=87=E0=B8=A5=E0=B8=B9?=
 =?UTF-8?q?=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=9B=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B0=E0=B8=88=E0=B8=B3=E0=B8=AF=20=3D>=20=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=84=20pagination?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/TreeTable.vue                   | 16 +++++++++++++---
 .../components/DialogMovePos.vue               | 18 ++++++++++++++++++
 .../components/TreeTable.vue                   | 18 +++++++++++++++++-
 3 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/modules/02_organizationalNew/components/TreeTable.vue b/src/modules/02_organizationalNew/components/TreeTable.vue
index f920550f6..88ccb2738 100644
--- a/src/modules/02_organizationalNew/components/TreeTable.vue
+++ b/src/modules/02_organizationalNew/components/TreeTable.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref } from "vue";
+import { ref, watch } from "vue";
 import { useQuasar } from "quasar";
 import config from "@/app.config";
 import http from "@/plugins/http";
@@ -435,9 +435,19 @@ async function onClickDownloadReport(val: string, name: string) {
 }
 
 const pagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+  page: reqMaster.value.page,
+  rowsPerPage: reqMaster.value.pageSize,
 });
+
+watch(
+  () => modalDialogMMove.value,
+  () => {
+    if (!modalDialogMMove.value) {
+      pagination.value.page = 1;
+      pagination.value.rowsPerPage = reqMaster.value.pageSize;
+    }
+  }
+);
 </script>
 
 <template>
diff --git a/src/modules/16_positionEmployee/components/DialogMovePos.vue b/src/modules/16_positionEmployee/components/DialogMovePos.vue
index 7d731b50d..fd9f28ae4 100644
--- a/src/modules/16_positionEmployee/components/DialogMovePos.vue
+++ b/src/modules/16_positionEmployee/components/DialogMovePos.vue
@@ -118,11 +118,26 @@ function onClickMovePos() {
   }
 }
 
+/**
+ * function updatePagination
+ * @param newPagination ข้อมูล Pagination ใหม่
+ */
+function updatePagination(newPagination: any) {
+  reqMaster.value.pageSize = newPagination.rowsPerPage;
+  reqMaster.value.page = 1;
+}
+
+const pagination = ref({
+  page: reqMaster.value.page,
+  rowsPerPage: reqMaster.value.pageSize,
+});
+
 watch(
   () => modal.value,
   () => {
     reqMaster.value.page = 1;
     filterTree.value = "";
+    pagination.value.rowsPerPage = reqMaster.value.pageSize;
 
     title.value = `ย้ายตำแหน่งจากหน่วยงาน/ส่วนราชการปัจจุบัน ${props.mainTree.orgName}`;
     if (modal.value && props.type === "SINGER") {
@@ -166,6 +181,9 @@ watch(
               no-data-label="ไม่มีข้อมูล"
               selection="multiple"
               v-model:selected="selectedFilter"
+              :rows-per-page-options="[10, 25, 50, 100]"
+              v-model:pagination="pagination"
+              @update:pagination="updatePagination"
             >
               <template v-slot:header-selection="scope">
                 <q-checkbox
diff --git a/src/modules/16_positionEmployee/components/TreeTable.vue b/src/modules/16_positionEmployee/components/TreeTable.vue
index bc41b5f21..e022d9b45 100644
--- a/src/modules/16_positionEmployee/components/TreeTable.vue
+++ b/src/modules/16_positionEmployee/components/TreeTable.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref } from "vue";
+import { ref, watch } from "vue";
 import { useQuasar } from "quasar";
 import config from "@/app.config";
 import http from "@/plugins/http";
@@ -346,6 +346,21 @@ async function onClickDownloadReport(val: string, name: string) {
       messageError($q, err);
     });
 }
+
+const pagination = ref({
+  page: reqMaster.value.page,
+  rowsPerPage: reqMaster.value.pageSize,
+});
+
+watch(
+  () => modalDialogMMove.value,
+  () => {
+    if (!modalDialogMMove.value) {
+      pagination.value.page = 1;
+      pagination.value.rowsPerPage = reqMaster.value.pageSize;
+    }
+  }
+);
 </script>
 
 <template>
@@ -458,6 +473,7 @@ async function onClickDownloadReport(val: string, name: string) {
       :rows-per-page-options="[10, 25, 50, 100]"
       @update:pagination="updatePagination"
       class="tableTb"
+      v-model:pagination="pagination"
     >
       <template v-slot:header="props">
         <q-tr :props="props">