From 8078a363351f8a9183c602422ca9a2b21e697fa0 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 17 Dec 2024 15:26:47 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=3D=3D=20>=20columns=20=E0=B8=A3=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=9C=E0=B8=B9?=
 =?UTF-8?q?=E0=B9=89=E0=B9=80=E0=B8=81=E0=B8=A9=E0=B8=B5=E0=B8=A2=E0=B8=93?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=B2=E0=B8=A2=E0=B8=B8=E0=B8=A3=E0=B8=B2=E0=B8=8A?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/01_retirement/RetirementDetail.vue     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue b/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue
index 11aa18083..ed676f086 100644
--- a/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue
+++ b/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue
@@ -57,7 +57,7 @@ const statusReport = ref<boolean>();
 const dataProfile = ref<Object>([]);
 
 /** คอลัมน์ที่แสดง */
-const columns = ref<any["columns"]>([
+const columns = computed(() => [
   {
     name: "order",
     label: "ลำดับ",
@@ -79,7 +79,7 @@ const columns = ref<any["columns"]>([
   {
     name: "position",
     align: "left",
-    label: "ตำแหน่ง",
+    label: `ตำแหน่ง ${employeeType.value == "OFFICER" ? "(ในสายงาน)" : ""}`,
     title: "ตำแหน่ง",
     subtitle: employeeType.value == "OFFICER" ? "ในสายงาน" : "",
     field: "position",
@@ -89,7 +89,9 @@ const columns = ref<any["columns"]>([
   {
     name: "positionType",
     align: "left",
-    label: "ตำแหน่ง",
+    label: `ตำแหน่ง (${
+      employeeType.value == "OFFICER" ? "ประเภท" : "กลุ่มงาน"
+    })`,
     title: "ตำแหน่ง",
     subtitle: employeeType.value == "OFFICER" ? "ประเภท" : "กลุ่มงาน",
     field: "positionType",
@@ -100,7 +102,7 @@ const columns = ref<any["columns"]>([
   {
     name: "positionNumber",
     align: "left",
-    label: "ตำแหน่ง (เลขที่) ",
+    label: "ตำแหน่ง (เลขที่)",
     title: "ตำแหน่ง",
     subtitle: "เลขที่",
     field: "positionNumber",
@@ -439,6 +441,7 @@ onMounted(async () => {
       @click="backHistory"
     />
     รายชื่อผู้เกษียณอายุราชการ
+    {{ employeeType === "OFFICER" ? "ข้าราชการ กทม.สามัญ" : "ลูกจ้างประจำ" }}
   </div>
   <div>
     <q-card class="col-12 q-pa-md">