From 74e204b5cc3d37c8f59d9e87dc8003a0de3174b9 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Fri, 2 Feb 2024 10:04:58 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=B4=E0=B8=94=20pop=20up=20?=
 =?UTF-8?q?=E0=B9=80=E0=B9=80=E0=B8=A5=E0=B9=89=E0=B8=A7=E0=B8=94=E0=B8=B6?=
 =?UTF-8?q?=E0=B8=87=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5?=
 =?UTF-8?q?=E0=B9=83=E0=B8=AB=E0=B8=A1=E0=B9=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/01_metadataNew/views/personal.vue      |  1 -
 .../components/DialogSortPosition.vue              | 14 ++++++++++++--
 .../02_organizationalNew/components/tableTree.vue  |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/modules/01_metadataNew/views/personal.vue b/src/modules/01_metadataNew/views/personal.vue
index c7e4ec9f2..ca34c83dc 100644
--- a/src/modules/01_metadataNew/views/personal.vue
+++ b/src/modules/01_metadataNew/views/personal.vue
@@ -49,7 +49,6 @@ onMounted(() => {
         />
       </q-tabs>
       <q-separator size="2px" />
-      <!-- person -->
       <ListPrefix v-if="currentTab == 'list_prefix'" />
       <ListRank v-if="currentTab == 'list_rank'" />
       <ListBloodGroup v-if="currentTab == 'list_bloodGroup'" />
diff --git a/src/modules/02_organizationalNew/components/DialogSortPosition.vue b/src/modules/02_organizationalNew/components/DialogSortPosition.vue
index 23abbc724..71650eade 100644
--- a/src/modules/02_organizationalNew/components/DialogSortPosition.vue
+++ b/src/modules/02_organizationalNew/components/DialogSortPosition.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, reactive, watch } from "vue";
+import { ref, reactive, watch,defineProps } from "vue";
 import { useQuasar } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
@@ -28,6 +28,10 @@ const columns = ref<QTableProps["columns"]>([
   },
 ]);
 
+const props = defineProps({
+  fetchDataTable: Function,
+});
+
 function onDrop(from: any, to: any) {
   onDropRow(from, to);
 }
@@ -40,6 +44,7 @@ function save() {
   dialogConfirm($q, () => {
     const data = rows.value;
     const dataId = data.map((item: any) => item.id);
+    showLoader()
     http
       .post(config.API.orgPosSort, {
         id: store.treeId,
@@ -49,11 +54,14 @@ function save() {
       .then((res) => {
         modal.value = false;
         success($q, "บันทึกข้อมูลสำเร็จ");
+        props.fetchDataTable?.(store.treeId,store.level,false)
       })
       .catch((e) => {
         messageError($q, e);
       })
-      .finally(() => {});
+      .finally(() => {
+        hideLoader()
+      });
   });
 }
 
@@ -86,6 +94,8 @@ function getData() {
       hideLoader();
     });
 }
+
+
 watch(
   () => modal.value,
   () => {
diff --git a/src/modules/02_organizationalNew/components/tableTree.vue b/src/modules/02_organizationalNew/components/tableTree.vue
index a59dc0125..a6d3f9eda 100644
--- a/src/modules/02_organizationalNew/components/tableTree.vue
+++ b/src/modules/02_organizationalNew/components/tableTree.vue
@@ -515,7 +515,7 @@ function updatePagination(newPagination: NewPagination) {
 
   <!-- รายละเอียดตำแหน่ง -->
   <DialogPositionDetail v-model:position-detail="dialogDetail" />
-  <DialogSort v-model:sort-position="modalSort" />
+  <DialogSort v-model:sort-position="modalSort" :fetchDataTable="props.fetchDataTable"/>
 </template>
 
 <style lang="scss" scoped>