From 61500c81a0e35370f5ba649d6acd9780c97c2a2d Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Wed, 5 Mar 2025 15:13:40 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=20?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=96=E0=B8=B2=E0=B8=99=E0=B8=A0=E0=B8=B2=E0=B8=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/05_Leave/TableList.vue         | 30 ++++++++++++++++++-
 .../09_leave/interface/response/leave.ts      |  1 +
 src/modules/09_leave/stores/LeaveStore.ts     |  1 +
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/modules/09_leave/components/05_Leave/TableList.vue b/src/modules/09_leave/components/05_Leave/TableList.vue
index 78a97518e..86ab16cba 100644
--- a/src/modules/09_leave/components/05_Leave/TableList.vue
+++ b/src/modules/09_leave/components/05_Leave/TableList.vue
@@ -33,6 +33,15 @@ const columnsLeave = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "profileType",
+    align: "left",
+    label: "สถานภาพ",
+    sortable: true,
+    field: "profileType",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "citizenId",
     align: "left",
@@ -117,6 +126,7 @@ const columnsLeave = ref<QTableProps["columns"]>([
 const visibleColumnsLeave = ref<string[]>([
   "no",
   "leaveTypeName",
+  "profileType",
   "citizenId",
   "fullName",
   "dateSendLeave",
@@ -147,6 +157,15 @@ const columnsReject = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "profileType",
+    align: "left",
+    label: "สถานภาพ",
+    sortable: true,
+    field: "profileType",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "fullName",
     align: "left",
@@ -178,6 +197,7 @@ const columnsReject = ref<QTableProps["columns"]>([
 const visibleReject = ref<string[]>([
   "no",
   "leaveTypeName",
+  "profileType",
   "fullName",
   "dateSendLeave",
   "status",
@@ -296,7 +316,15 @@ onMounted(() => {
           <div v-else-if="col.name == 'leaveTypeName'">
             {{ convert(props.row) }}
           </div>
-
+          <div v-else-if="col.name == 'profileType'">
+            {{
+              col.value !== "-"
+                ? col.value == "OFFICER"
+                  ? "ข้าราชการ กทม. สามัญ"
+                  : "ลูกจ้างประจำ กทม."
+                : "-"
+            }}
+          </div>
           <div v-else class="table_ellipsis">
             {{ col.value }}
           </div>
diff --git a/src/modules/09_leave/interface/response/leave.ts b/src/modules/09_leave/interface/response/leave.ts
index 38d0b0e6f..cac8aecda 100644
--- a/src/modules/09_leave/interface/response/leave.ts
+++ b/src/modules/09_leave/interface/response/leave.ts
@@ -17,6 +17,7 @@ interface ListLeave {
   leaveStartDate?: Date | null;
   leaveEndDate?: Date | null;
   agency?: string;
+  profileType?: string;
   org?: string;
   position?: string;
   level?: string;
diff --git a/src/modules/09_leave/stores/LeaveStore.ts b/src/modules/09_leave/stores/LeaveStore.ts
index 2557cdaf5..a77c55b4e 100644
--- a/src/modules/09_leave/stores/LeaveStore.ts
+++ b/src/modules/09_leave/stores/LeaveStore.ts
@@ -44,6 +44,7 @@ export const useLeavelistDataStore = defineStore("leave", () => {
     let datalist = data.map((e: ListLeave) => ({
       id: e.id,
       leaveTypeName: e.leaveTypeName ?? "-",
+      profileType: e.profileType ?? "-",
       leaveTypeId: e.leaveTypeId ?? "-",
       citizenId: e.citizenId ?? "-",
       fullName: