From 64bb5a27496bfb387a2bbd2554b645c127327835 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 26 Mar 2024 14:37:05 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=AD=E0=B8=B1=E0=B8=95?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=81=E0=B8=B3=E0=B8=A5=E0=B8=B1=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../02_organizationalNew/components/TreeMain.vue      |  2 --
 .../02_organizationalNew/components/TreeTable.vue     | 10 ++++++++--
 .../02_organizationalNew/components/TreeView.vue      | 11 ++++-------
 .../16_positionEmployee/components/TreeView.vue       |  4 ++--
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/modules/02_organizationalNew/components/TreeMain.vue b/src/modules/02_organizationalNew/components/TreeMain.vue
index a3fb420e8..6e45a3e90 100644
--- a/src/modules/02_organizationalNew/components/TreeMain.vue
+++ b/src/modules/02_organizationalNew/components/TreeMain.vue
@@ -285,8 +285,6 @@ function onClickDetail(id: string, level: number) {
  * @param node ข้อมูล โครงสร้าง
  */
 async function onClickEdit(node: OrgTree) {
-  console.log(node);
-
   dialogAgency.value = !dialogAgency.value;
   actionType.value = "EDIT";
   orgLevel.value = node.orgLevel;
diff --git a/src/modules/02_organizationalNew/components/TreeTable.vue b/src/modules/02_organizationalNew/components/TreeTable.vue
index 37946bc5c..f920550f6 100644
--- a/src/modules/02_organizationalNew/components/TreeTable.vue
+++ b/src/modules/02_organizationalNew/components/TreeTable.vue
@@ -433,6 +433,11 @@ async function onClickDownloadReport(val: string, name: string) {
       messageError($q, err);
     });
 }
+
+const pagination = ref({
+  page: 1,
+  rowsPerPage: 10,
+});
 </script>
 
 <template>
@@ -537,14 +542,14 @@ async function onClickDownloadReport(val: string, name: string) {
       ref="table"
       :columns="columns"
       :rows="posMaster"
+      :paging="true"
       row-key="id"
       flat
       bordered
-      :paging="true"
       dense
       :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">
@@ -773,6 +778,7 @@ async function onClickDownloadReport(val: string, name: string) {
           active-color="primary"
           color="dark"
           :max="totalPage"
+          :max-pages="5"
           size="sm"
           boundary-links
           direction-links
diff --git a/src/modules/02_organizationalNew/components/TreeView.vue b/src/modules/02_organizationalNew/components/TreeView.vue
index 5e3cf67bc..e0ac771d3 100644
--- a/src/modules/02_organizationalNew/components/TreeView.vue
+++ b/src/modules/02_organizationalNew/components/TreeView.vue
@@ -84,7 +84,6 @@ async function fetchDataTree(id: string) {
  */
 async function fetchDataTable(id: string, level: number, action: boolean) {
   searchAndReplaceOrgName(nodeTree.value, id);
-
   orgLevel.value = level;
   reqMaster.id = id;
   reqMaster.type = level;
@@ -103,14 +102,12 @@ async function fetchDataTable(id: string, level: number, action: boolean) {
         : store.typeOrganizational == "current"
         ? store.activeId
         : store.historyId;
-  }
-
-  if (action === true) {
     isLoad.value = true;
   }
+
   await http
     .post(config.API.orgPosMasterList, reqMaster)
-    .then((res) => {
+    .then(async (res) => {
       posMaster.value = [];
       const dataMain: PosMaster[] = [];
       totalPage.value = Math.ceil(res.data.result.total / reqMaster.pageSize);
@@ -123,7 +120,7 @@ async function fetchDataTable(id: string, level: number, action: boolean) {
           dataMain.push(test);
         }
       });
-      posMaster.value = store.fetchPosMaster(dataMain);
+      posMaster.value = await store.fetchPosMaster(dataMain);
     })
     .catch((err) => {
       messageError($q, err);
@@ -132,7 +129,7 @@ async function fetchDataTable(id: string, level: number, action: boolean) {
     .finally(() => {
       setTimeout(() => {
         isLoad.value = false;
-      }, 500);
+      }, 1000);
     });
 }
 
diff --git a/src/modules/16_positionEmployee/components/TreeView.vue b/src/modules/16_positionEmployee/components/TreeView.vue
index 52bea0652..659a8ab49 100644
--- a/src/modules/16_positionEmployee/components/TreeView.vue
+++ b/src/modules/16_positionEmployee/components/TreeView.vue
@@ -101,7 +101,7 @@ async function fetchDataTable(id: string, level: number, action: boolean) {
   }
   await http
     .post(config.API.orgPosMasterListEmp, reqMaster)
-    .then((res) => {
+    .then(async (res) => {
       posMaster.value = [];
       const dataMain: PosMaster[] = [];
       totalPage.value = Math.ceil(res.data.result.total / reqMaster.pageSize);
@@ -114,7 +114,7 @@ async function fetchDataTable(id: string, level: number, action: boolean) {
           dataMain.push(test);
         }
       });
-      posMaster.value = store.fetchPosMaster(dataMain);
+      posMaster.value = await store.fetchPosMaster(dataMain);
     })
     .catch((err) => {
       messageError($q, err);