From 2b1ecba003f852376fd2dcc1a0cbe7dd0ec120ea Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 5 Nov 2025 20:31:25 +0700
Subject: [PATCH 1/2] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=84=E0=B8=99=E0=B8=84=E0=B8=A3=E0=B8=AD=E0=B8=87?=
 =?UTF-8?q?=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B9=81=E0=B8=9A=E0=B8=9A=E0=B8=A3?=
 =?UTF-8?q?=E0=B9=88=E0=B8=B2=E0=B8=87=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B9=81?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=94=E0=B8=87=20=E0=B8=9B=E0=B8=B1=E0=B8=88?=
 =?UTF-8?q?=E0=B8=88=E0=B8=B8=E0=B8=9A=E0=B8=B1=E0=B8=99/=E0=B9=81?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=9A=E0=B8=A3=E0=B9=88=E0=B8=B2=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../02_organization/components/DialogHistoryPos.vue   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/modules/02_organization/components/DialogHistoryPos.vue b/src/modules/02_organization/components/DialogHistoryPos.vue
index 7842de7e9..2acfd5cd7 100644
--- a/src/modules/02_organization/components/DialogHistoryPos.vue
+++ b/src/modules/02_organization/components/DialogHistoryPos.vue
@@ -212,10 +212,9 @@ function formatHistoryData(data: HistoryPos[]) {
 function formatHistoryOwnerData(data: HistoryPos[]) {
   return data.map((item) => ({
     ...item,
-    fullname:
-      item.firstName
-        ? `${item.prefix}${item.firstName} ${item.lastName}`.trim()
-        : "ว่าง",
+    fullname: item.firstName
+      ? `${item.prefix}${item.firstName} ${item.lastName}`.trim()
+      : "ว่าง",
   }));
 }
 
@@ -266,7 +265,9 @@ watch(
               <q-td v-for="col in props.cols" :key="col.name" :props="props">
                 <div v-if="col.name == 'no'">
                   {{
-                    store.typeOrganizational === "current"
+                    store.typeOrganizational === "current" ||
+                    (store.typeOrganizational === "draft" &&
+                      historyType === "OWNER_HISTORY")
                       ? props.rowIndex + 1
                       : props.rowIndex + 1 == 1
                       ? "1 (แบบร่าง)"

From 48efe456631e88e205fb7011a4741868297ec73c Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 5 Nov 2025 20:40:00 +0700
Subject: [PATCH 2/2] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A1=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=9C=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=AD=E0=B8=9A=E0=B8=A0=E0=B8=B2=E0=B8=84=20?=
 =?UTF-8?q?=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../03_recruiting/views/02_qualify/manageDetail.vue | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/modules/03_recruiting/views/02_qualify/manageDetail.vue b/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
index 2eb35fd19..a42019bf1 100644
--- a/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
+++ b/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
@@ -40,6 +40,7 @@ const visibleColumns = ref<String[]>([
   "registerDate",
   "examIdenNumber",
   "seatNumber",
+  "resultA",
   "resultB",
   "resultC",
   "pass",
@@ -157,6 +158,15 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px;",
     style: "font-size: 14px; ",
   },
+  {
+    name: "resultA",
+    align: "left",
+    label: "ผลสอบภาค ก",
+    sortable: true,
+    field: "resultA",
+    headerStyle: "font-size: 14px;",
+    style: "font-size: 14px; ",
+  },
   {
     name: "resultB",
     align: "left",
@@ -260,8 +270,9 @@ async function fetchData(loading: boolean = true) {
             registerDate: date2Thai(r.registerDate, false, true),
             examIdenNumber: r.examIdenNumber,
             seatNumber: r.seatNumber,
-            resultC: r.resultC,
+            resultA: r.resultA,
             resultB: r.resultB,
+            resultC: r.resultC,
             pass: r.pass,
             email: r.email,
             status: r.status,