From 8779aec459b8baabc7bc6e0e8bc83a942288c847 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 21 Feb 2024 16:05:11 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9A=E0=B8=A3=E0=B8=A3=E0=B8=88=E0=B8=B8?=
 =?UTF-8?q?=20>=20=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=8A=E0=B8=B7?=
 =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=9C=E0=B8=B9=E0=B9=89=E0=B8=AA=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=9A=E0=B9=83=E0=B8=99=E0=B8=A3=E0=B8=AD=E0=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PersonalList/Table.vue           | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index e1937568c..10a2725a7 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -306,6 +306,9 @@ async function getTable() {
             nodeId: data.nodeId,
             posmasterId: data.posmasterId,
             positionId: data.positionId,
+            orgTreeShortName: data.orgTreeShortName,
+            posPath: data.posPath,
+            posNumber: data.posNumber,
           };
           rowsAll.value.push(rowData);
         });
@@ -687,20 +690,16 @@ onMounted(async () => {
                   <div class="text-weight-medium">
                     {{ props.row.orgName !== null ? props.row.orgName : "-" }}
                     {{
-                      props.row.organizationShortName !== null
-                        ? `(${props.row.organizationShortName})`
+                      props.row.orgTreeShortName !== null
+                        ? `(${props.row.orgTreeShortName})`
                         : ""
                     }}
                   </div>
                   <div class="text-weight-light">
+                    {{ props.row.posPath !== null ? props.row.posPath : "-" }}
                     {{
-                      props.row.positionPath !== null
-                        ? props.row.positionPath
-                        : "-"
-                    }}
-                    {{
-                      props.row.positionNumber !== null
-                        ? `(${props.row.positionNumber})`
+                      props.row.orgTreeShortName !== null
+                        ? `(${props.row.orgTreeShortName}${props.row.posNumber})`
                         : ""
                     }}
                   </div>