From 3aa299ae8ebbe6d03599d79b52741ea10badd585 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Fri, 6 Jun 2025 11:27:14 +0700
Subject: [PATCH] fix ordering oraganization

---
 .../02_organization/components/DialogSortPosition.vue     | 8 ++++++--
 src/modules/02_organization/components/TableMain.vue      | 1 +
 .../16_positionEmployee/components/DialogSortPosition.vue | 6 +++++-
 src/modules/16_positionEmployee/components/TableMain.vue  | 6 +++++-
 .../20_positionTemp/components/DialogSortPosition.vue     | 6 +++++-
 src/modules/20_positionTemp/components/TableMain.vue      | 5 +++--
 6 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/modules/02_organization/components/DialogSortPosition.vue b/src/modules/02_organization/components/DialogSortPosition.vue
index f9bf5a4fc..34669b258 100644
--- a/src/modules/02_organization/components/DialogSortPosition.vue
+++ b/src/modules/02_organization/components/DialogSortPosition.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watch,  } from "vue";
+import { ref, watch } from "vue";
 import { useQuasar } from "quasar";
 
 import http from "@/plugins/http";
@@ -24,6 +24,10 @@ const { dialogConfirm, showLoader, success, hideLoader, messageError } =
 const modal = defineModel<boolean>("sortPosition", { required: true });
 const props = defineProps({
   fetchDataTable: Function,
+  totalData: {
+    type: Number,
+    default: 0,
+  },
 });
 
 /** ข้อมูล Table*/
@@ -83,7 +87,7 @@ function getData() {
       type: store.level,
       isAll: false,
       page: 1,
-      pageSize: 100,
+      pageSize: props.totalData,
       keyword: "",
       revisionId: store.draftId,
     })
diff --git a/src/modules/02_organization/components/TableMain.vue b/src/modules/02_organization/components/TableMain.vue
index fb56e2611..2c6a10901 100644
--- a/src/modules/02_organization/components/TableMain.vue
+++ b/src/modules/02_organization/components/TableMain.vue
@@ -966,6 +966,7 @@ watch(
   <DialogSort
     v-model:sort-position="modalSort"
     :fetchDataTable="props.fetchDataTable"
+    :total-data="totalData"
   />
 
   <!-- ย้ายตำแหน่ง -->
diff --git a/src/modules/16_positionEmployee/components/DialogSortPosition.vue b/src/modules/16_positionEmployee/components/DialogSortPosition.vue
index 37a324500..1ec9d0156 100644
--- a/src/modules/16_positionEmployee/components/DialogSortPosition.vue
+++ b/src/modules/16_positionEmployee/components/DialogSortPosition.vue
@@ -32,6 +32,10 @@ const { dialogConfirm, showLoader, success, hideLoader, messageError } =
 const modal = defineModel<boolean>("sortPosition", { required: true });
 const props = defineProps({
   fetchDataTable: Function,
+  totalData: {
+    type: Number,
+    default: 0,
+  },
 });
 
 /** ข้อมูล Table*/
@@ -95,7 +99,7 @@ function getData() {
       type: store.level,
       isAll: false,
       page: 1,
-      pageSize: 100,
+      pageSize: props.totalData,
       keyword: "",
       revisionId: store.activeId,
     })
diff --git a/src/modules/16_positionEmployee/components/TableMain.vue b/src/modules/16_positionEmployee/components/TableMain.vue
index c67b32b44..c8298c04a 100644
--- a/src/modules/16_positionEmployee/components/TableMain.vue
+++ b/src/modules/16_positionEmployee/components/TableMain.vue
@@ -648,7 +648,10 @@ watch(
                 icon="info"
                 color="info"
                 round
-                @click="(modalPerson = true), (personalId = props.row.current_holderId)"
+                @click="
+                  (modalPerson = true),
+                    (personalId = props.row.current_holderId)
+                "
               >
                 <q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>
               </q-btn>
@@ -699,6 +702,7 @@ watch(
   <DialogSort
     v-model:sort-position="modalSort"
     :fetchDataTable="props.fetchDataTable"
+    :total-data="totalData"
   />
 
   <!-- ย้ายตำแหน่ง -->
diff --git a/src/modules/20_positionTemp/components/DialogSortPosition.vue b/src/modules/20_positionTemp/components/DialogSortPosition.vue
index 48a1cf079..c132471c8 100644
--- a/src/modules/20_positionTemp/components/DialogSortPosition.vue
+++ b/src/modules/20_positionTemp/components/DialogSortPosition.vue
@@ -32,6 +32,10 @@ const { dialogConfirm, showLoader, success, hideLoader, messageError } =
 const modal = defineModel<boolean>("sortPosition", { required: true });
 const props = defineProps({
   fetchDataTable: Function,
+  totalData: {
+    type: Number,
+    default: 0,
+  },
 });
 
 /** ข้อมูล Table*/
@@ -95,7 +99,7 @@ function getData() {
       type: store.level,
       isAll: false,
       page: 1,
-      pageSize: 100,
+      pageSize: props.totalData,
       keyword: "",
       revisionId: store.activeId,
     })
diff --git a/src/modules/20_positionTemp/components/TableMain.vue b/src/modules/20_positionTemp/components/TableMain.vue
index 9650620f7..a58b969fe 100644
--- a/src/modules/20_positionTemp/components/TableMain.vue
+++ b/src/modules/20_positionTemp/components/TableMain.vue
@@ -397,7 +397,7 @@ watch(
           <q-tooltip>เพิ่มตำแหน่ง</q-tooltip>
         </q-btn>
 
-        <!-- <q-btn
+        <q-btn
           v-if="checkPermission($route)?.attrIsUpdate"
           flat
           round
@@ -407,7 +407,7 @@ watch(
           @click="onClickSort()"
         >
           <q-tooltip>จัดลำดับ</q-tooltip>
-        </q-btn> -->
+        </q-btn>
 
         <q-btn
           v-if="checkPermission($route)?.attrIsUpdate"
@@ -703,6 +703,7 @@ watch(
   <DialogSort
     v-model:sort-position="modalSort"
     :fetchDataTable="props.fetchDataTable"
+    :total-data="totalData"
   />
 
   <!-- ย้ายตำแหน่ง -->