From 36289d0d74b79ccefaa9d2595ce9d57160639f90 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 11 Apr 2025 12:36:19 +0700
Subject: [PATCH] =?UTF-8?q?=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=A5=E0=B8=B9=E0=B8=81=E0=B8=88=E0=B9=89?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=87=E0=B8=8A=E0=B8=B1=E0=B9=88=E0=B8=A7=E0=B8=84?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../08_registryEmployee/views/Main.vue        | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue
index 1ca25f062..959ec554e 100644
--- a/src/modules/08_registryEmployee/views/Main.vue
+++ b/src/modules/08_registryEmployee/views/Main.vue
@@ -93,21 +93,21 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "draftOrganizationOrganization",
     align: "left",
-    label: "หน่วยงานที่รับการบรรจุ",
+    label: "ตำแหน่ง/หน่วยงานที่รับการบรรจุ",
     sortable: false,
     field: "draftOrganizationOrganization",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
-  {
-    name: "draftPositionEmployee",
-    align: "left",
-    label: "หน่วยงานที่บรรจุ",
-    sortable: false,
-    field: "draftPositionEmployee",
-    headerStyle: "font-size: 14px; min-width: 200px",
-    style: "font-size: 14px; ",
-  },
+  // {
+  //   name: "draftPositionEmployee",
+  //   align: "left",
+  //   label: "ตำแหน่งที่บรรจุ",
+  //   sortable: false,
+  //   field: "draftPositionEmployee",
+  //   headerStyle: "font-size: 14px; min-width: 200px",
+  //   style: "font-size: 14px; ",
+  // },
 
   {
     name: "govAge",
@@ -193,7 +193,7 @@ const visibleColumns = ref<String[]>([
   "citizenId",
   "fullname",
   "draftOrganizationOrganization",
-  "draftPositionEmployee",
+  // "draftPositionEmployee",
   "govAge",
   "dateEmployment",
   "age",
@@ -465,8 +465,23 @@ onMounted(async () => {
                   "
                 >
                   <div class="col-4">
+                    <div>
+                      {{
+                        props.row.position !== null ? props.row.position : "-"
+                      }}
+                      {{
+                        props.row.posTypeShortName !== null
+                          ? `(${props.row.posTypeShortName}`
+                          : ""
+                      }}
+                      {{
+                        props.row.posLevel !== null
+                          ? `${props.row.posLevel})`
+                          : ""
+                      }}
+                    </div>
                     <div class="text-weight-medium">
-                      {{ props.row.root !== null ? props.row.root : "-" }}
+                      {{ props.row.root !== null ? props.row.root : "" }}
                       {{
                         props.row.rootShortName !== null
                           ? `(${props.row.rootShortName})`