From ab578198865bcb54154cf379d19064e2b7c48b31 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Tue, 9 Sep 2025 10:08:03 +0700
Subject: [PATCH] =?UTF-8?q?fix:=20=E0=B9=81=E0=B8=81=E0=B9=89=20=E0=B8=9B?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B8=84?=
 =?UTF-8?q?=E0=B8=99=E0=B8=84=E0=B8=A3=E0=B8=AD=E0=B8=87/=20=E0=B8=9B?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B8=95?=
 =?UTF-8?q?=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DialogHistoryPos.vue                | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/modules/02_organization/components/DialogHistoryPos.vue b/src/modules/02_organization/components/DialogHistoryPos.vue
index 017c504e7..7842de7e9 100644
--- a/src/modules/02_organization/components/DialogHistoryPos.vue
+++ b/src/modules/02_organization/components/DialogHistoryPos.vue
@@ -102,7 +102,7 @@ const baseColumns = ref<QTableProps["columns"]>([
   {
     name: "position",
     align: "left",
-    label: "ตำแแหน่ง",
+    label: "ตำแหน่งในสายงาน",
     sortable: true,
     field: "position",
     headerStyle: "font-size: 14px",
@@ -119,11 +119,11 @@ const baseColumns = ref<QTableProps["columns"]>([
     format(val, row) {
       let name = "";
       if (row.posType && row.position) {
-        name = `${row.posType} (${row.position})`;
+        name = `${row.posType} (${row.posLevel})`;
       } else if (row.posType) {
         name = `${row.posType}`;
-      } else if (row.position) {
-        name = `(${row.position})`;
+      } else if (row.posLevel) {
+        name = `(${row.posLevel})`;
       } else name = "-";
       return name;
     },
@@ -213,9 +213,9 @@ function formatHistoryOwnerData(data: HistoryPos[]) {
   return data.map((item) => ({
     ...item,
     fullname:
-      item.prefix && item.firstName && item.lastName
-        ? `${item.prefix} ${item.firstName} ${item.lastName}`.trim()
-        : "-",
+      item.firstName
+        ? `${item.prefix}${item.firstName} ${item.lastName}`.trim()
+        : "ว่าง",
   }));
 }