Merge branch 'develop' into dev

* develop:
  เพิ่มแสดงผลสอบภาค ก
  แก้ไขประวัติคนครองที่แบบร่างไม่แสดง ปัจจุบัน/แบบร่าง

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:
+    fullname: item.firstName
-      item.firstName
+      ? `${item.prefix}${item.firstName} ${item.lastName}`.trim()
-        ? `${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 (แบบร่าง)"

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,