From fca496acd486a9614058e617d1c134772e12b0bf Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 17 May 2024 16:23:25 +0700
Subject: [PATCH] =?UTF-8?q?list=20able=20=E0=B8=97=E0=B8=B0=E0=B9=80?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../04_registryNew/components/TableView.vue   | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/modules/04_registryNew/components/TableView.vue b/src/modules/04_registryNew/components/TableView.vue
index 6f8bc3084..bcdbb6924 100644
--- a/src/modules/04_registryNew/components/TableView.vue
+++ b/src/modules/04_registryNew/components/TableView.vue
@@ -75,7 +75,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "posPath",
     align: "left",
-    label: "สายงาน",
+    label: "ประเภทตำแหน่ง",
     sortable: true,
     field: "posType",
     headerStyle: "font-size: 14px",
@@ -91,6 +91,11 @@ const columns = ref<QTableProps["columns"]>([
     field: "posLevel",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return row.posTypeShortName
+        ? row.posTypeShortName +" "+ row.posLevel
+        : row.posLevel;
+    },
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
@@ -284,7 +289,16 @@ watch(
     <template v-slot:header="props">
       <q-tr :props="props">
         <q-th v-for="col in props.cols" :key="col.name" :props="props">
-          <span class="text-weight-medium">{{ col.label }}</span>
+          <span class="text-weight-medium" v-if="col.name === 'posLevel'">{{
+            empType === "officer" ? col.label : "ระดับชั้นงาน"
+          }}</span>
+          <span
+            class="text-weight-medium"
+            v-else-if="col.name === 'posPath'"
+            >{{ empType === "officer" ? col.label : "กลุ่มงาน" }}</span
+          >
+
+          <span class="text-weight-medium" v-else>{{ col.label }}</span>
         </q-th>
       </q-tr>
     </template>
@@ -398,7 +412,11 @@ watch(
                   <q-item-section>
                     <q-item-label caption class="text-black">
                       {{
-                        props.row.posLevel ? props.row.posLevel : "-"
+                        props.row.posLevel
+                          ? props.row.posTypeShortName
+                            ? `${props.row.posTypeShortName} ${props.row.posLevel}`
+                            : props.row.posLevel
+                          : "-"
                       }}</q-item-label
                     >
                   </q-item-section>