อัตรากำลังลูกจ้างประจำฯ => บัค pagination

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,
+  page: reqMaster.value.page,
-  rowsPerPage: 10,
+  rowsPerPage: reqMaster.value.pageSize,
 });
+
+watch(
+  () => modalDialogMMove.value,
+  () => {
+    if (!modalDialogMMove.value) {
+      pagination.value.page = 1;
+      pagination.value.rowsPerPage = reqMaster.value.pageSize;
+    }
+  }
+);
 </script>
 
 <template>

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

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">