From bf29f6d058278cd3873bbfab0ac10a5ca0b38684 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 25 Apr 2025 14:45:52 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B9=88?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=99=E0=B8=82=E0=B8=B1=E0=B9=89=E0=B8=99=E0=B9=80?=
 =?UTF-8?q?=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../04_salaryLists/DialogMoveLevelMulti.vue   | 44 +++++--------------
 .../DialogMoveLevelMulti.vue                  | 43 +++++-------------
 2 files changed, 21 insertions(+), 66 deletions(-)

diff --git a/src/modules/13_salary/components/04_salaryLists/DialogMoveLevelMulti.vue b/src/modules/13_salary/components/04_salaryLists/DialogMoveLevelMulti.vue
index 16fa30827..1f2c3b884 100644
--- a/src/modules/13_salary/components/04_salaryLists/DialogMoveLevelMulti.vue
+++ b/src/modules/13_salary/components/04_salaryLists/DialogMoveLevelMulti.vue
@@ -166,6 +166,11 @@ function inputEdit(val: boolean) {
   };
 }
 
+const pagination = ref({
+  page: 1,
+  rowsPerPage: 50,
+});
+
 watch(
   () => modal.value,
   () => {
@@ -177,6 +182,8 @@ watch(
       keyword.value = "";
       type.value = "";
       selectedData.value = [];
+      pagination.value.page = 1;
+      pagination.value.rowsPerPage = 50;
     }
   }
 );
@@ -267,8 +274,7 @@ watch(
           <div class="row justify-end">ทั้งหมด {{ rows.length }} รายการ</div>
 
           <div class="col-12 q-mt-sm">
-            <q-table
-              class="custom-header-table"
+            <d-table
               ref="table"
               :columns="columns"
               :rows="rows"
@@ -276,11 +282,10 @@ watch(
               flat
               bordered
               dense
-              hide-pagination
               :visible-columns="visibleColumns"
               selection="multiple"
               v-model:selected="selectedData"
-              :pagination="{ page: 1, rowsPerPage: total }"
+              v-model:pagination="pagination"
             >
               <template v-slot:header-selection="scope">
                 <q-checkbox
@@ -336,7 +341,7 @@ watch(
                   </q-td>
                 </q-tr>
               </template>
-            </q-table>
+            </d-table>
           </div>
         </div>
       </q-card-section>
@@ -353,31 +358,4 @@ watch(
   </q-dialog>
 </template>
 
-<style lang="scss" scoped>
-.custom-header-table {
-  height: auto;
-  .q-table tr:nth-child(odd) td {
-    background: white;
-  }
-  .q-table tr:nth-child(even) td {
-    background: #f8f8f8;
-  }
-
-  .q-table thead tr {
-    background: #ecebeb;
-  }
-
-  .q-table thead tr th {
-    position: sticky;
-    z-index: 1;
-  }
-  /* this will be the loading indicator */
-  .q-table thead tr:last-child th {
-    /* height of all previous header rows */
-    top: 48px;
-  }
-  .q-table thead tr:first-child th {
-    top: 0;
-  }
-}
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/DialogMoveLevelMulti.vue b/src/modules/13_salary/components/05_salaryListsEmployee/DialogMoveLevelMulti.vue
index 705a5404d..bb4bc9ca9 100644
--- a/src/modules/13_salary/components/05_salaryListsEmployee/DialogMoveLevelMulti.vue
+++ b/src/modules/13_salary/components/05_salaryListsEmployee/DialogMoveLevelMulti.vue
@@ -83,6 +83,10 @@ const typeRangeOps = computed(() => {
 });
 
 const keyword = ref<string>("");
+const pagination = ref({
+  page: 1,
+  rowsPerPage: 50,
+});
 
 /**
  * function เรียกข้อมูลรายชื่อ
@@ -177,6 +181,8 @@ watch(
       keyword.value = "";
       type.value = "";
       selectedData.value = [];
+      pagination.value.page = 1;
+      pagination.value.rowsPerPage = 50;
     }
   }
 );
@@ -267,8 +273,7 @@ watch(
           <div class="row justify-end">ทั้งหมด {{ rows.length }} รายการ</div>
 
           <div class="col-12 q-mt-sm">
-            <q-table
-              class="custom-header-table"
+            <d-table
               ref="table"
               :columns="columns"
               :rows="rows"
@@ -276,11 +281,10 @@ watch(
               flat
               bordered
               dense
-              hide-pagination
               :visible-columns="visibleColumns"
               selection="multiple"
               v-model:selected="selectedData"
-              :pagination="{ page: 1, rowsPerPage: total }"
+              v-model:pagination="pagination"
             >
               <template v-slot:header-selection="scope">
                 <q-checkbox
@@ -336,7 +340,7 @@ watch(
                   </q-td>
                 </q-tr>
               </template>
-            </q-table>
+            </d-table>
           </div>
         </div>
       </q-card-section>
@@ -353,31 +357,4 @@ watch(
   </q-dialog>
 </template>
 
-<style lang="scss" scoped>
-.custom-header-table {
-  height: auto;
-  .q-table tr:nth-child(odd) td {
-    background: white;
-  }
-  .q-table tr:nth-child(even) td {
-    background: #f8f8f8;
-  }
-
-  .q-table thead tr {
-    background: #ecebeb;
-  }
-
-  .q-table thead tr th {
-    position: sticky;
-    z-index: 1;
-  }
-  /* this will be the loading indicator */
-  .q-table thead tr:last-child th {
-    /* height of all previous header rows */
-    top: 48px;
-  }
-  .q-table thead tr:first-child th {
-    top: 0;
-  }
-}
-</style>
+<style lang="scss" scoped></style>