From db9546b389125e956ec3edbc2bb5e4faf9a5c717 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 17 Dec 2024 16:03:49 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=3D=3D>=20=E0=B8=81=E0=B8=B3=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=99=E0=B8=94=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99?=
 =?UTF-8?q?=E0=B9=88=E0=B8=87=20=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A1=20columns=20=E0=B8=84=E0=B8=99=E0=B8=84=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DialogSelectPos.vue              | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/modules/08_registryEmployee/components/DialogSelectPos.vue b/src/modules/08_registryEmployee/components/DialogSelectPos.vue
index 0f9c090ed..263863f49 100644
--- a/src/modules/08_registryEmployee/components/DialogSelectPos.vue
+++ b/src/modules/08_registryEmployee/components/DialogSelectPos.vue
@@ -115,6 +115,18 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "positionIsSelected",
+    align: "left",
+    label: "คนครอง",
+    sortable: true,
+    field: "positionIsSelected",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return val ? row.fullNameCurrentHolder : "-";
+    },
+  },
 ]);
 const columnsPostition = ref<QTableProps["columns"]>([
   {
@@ -197,6 +209,7 @@ const visibleColumns = ref<string[]>([
   "positionName",
   "posTypeName",
   "posLevelName",
+  "positionIsSelected",
 ]);
 
 /** Position*/
@@ -241,6 +254,7 @@ function updateSelected(data: TreeMain) {
 
   nodeId.value = data.orgTreeId ? data.orgTreeId : "";
   nodeLevel.value = data.orgLevel;
+
   fetchDataTable(data.orgTreeId, data.orgLevel);
 }
 
@@ -283,6 +297,7 @@ async function fetchDataTable(id: string, level: number = 0) {
           dataMain.push(data);
         }
       });
+
       positionNo.value = dataMain;
       positionNoMain.value = dataMain;
     })
@@ -440,6 +455,8 @@ watch(
       await clearData();
       if (props?.dataRow?.node !== null && props?.dataRow?.nodeId !== null) {
         await fetchPosFind(props?.dataRow?.node, props?.dataRow?.nodeId);
+        nodeLevel.value = props?.dataRow?.node;
+        nodeId.value = props.dataRow?.nodeId;
       } else {
         expanded.value = [];
       }