From 157cce6919be7fe8d616125f37315991606d4d2f Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 16 Oct 2025 09:57:10 +0700
Subject: [PATCH 1/5] style(registry-officer):display  colums training

---
 .../components/detail/Achievement/02_Train.vue             | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue b/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue
index b1fda246c..e96d954e3 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue
@@ -147,7 +147,8 @@ const baseColumns = ref<QTableColumn[]>([
     sortable: true,
     field: "place",
     headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
+    style: "font-size: 14px; width: 250px;",
+    classes: "text-html",
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
@@ -169,7 +170,7 @@ const baseColumns = ref<QTableColumn[]>([
     sortable: true,
     field: "department",
     headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
+    style: "font-size: 14px; ",
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
@@ -550,7 +551,7 @@ onMounted(() => {
           </q-btn>
         </q-td>
         <q-td v-for="col in props.cols" :key="col.id">
-          <div>
+          <div :class="col.classes" :style="col.style">
             {{ col.value ? col.value : "-" }}
           </div>
         </q-td>

From 3210bbf68734d6bccf1e784ce7b1e9cbbc99e320 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 17 Oct 2025 10:02:24 +0700
Subject: [PATCH 2/5] fix:filter examResult

---
 .../03_recruiting/components/Table.vue        |  33 ++++-
 .../03_recruiting/views/01_compete/Detail.vue | 120 ++++--------------
 .../views/02_qualify/DisableDetail.vue        |  72 ++++-------
 3 files changed, 82 insertions(+), 143 deletions(-)

diff --git a/src/modules/03_recruiting/components/Table.vue b/src/modules/03_recruiting/components/Table.vue
index 7c7f200c8..847679f5c 100644
--- a/src/modules/03_recruiting/components/Table.vue
+++ b/src/modules/03_recruiting/components/Table.vue
@@ -7,7 +7,11 @@ const attrs = ref<any>(useAttrs());
 const table = ref<any>(null);
 const filterRef = ref<any>(null);
 
-const filter = defineModel<string>("filter", { required: true });
+const filter = defineModel<string>("filter", { required: false });
+const examResult = defineModel<string>("examResult", {
+  required: false,
+  default: "",
+});
 const pagination = defineModel<Pagination>("pagination", { required: true });
 
 const props = defineProps({
@@ -44,6 +48,13 @@ const props = defineProps({
   },
 });
 
+const optionsStatus = ref<any[]>([
+  { label: "ทั้งหมด", value: "" },
+  { label: "ขส.", value: "missed_exam" },
+  { label: "ผ่าน", value: "pass" },
+  { label: "ไม่ผ่าน", value: "notpass" },
+]);
+
 const emit = defineEmits([
   "update:inputfilter",
   "update:inputvisible",
@@ -92,6 +103,7 @@ watch(
   }
 );
 </script>
+
 <template>
   <div class="q-pb-sm row q-col-gutter-sm">
     <div
@@ -134,7 +146,6 @@ watch(
           />
         </div>
       </q-card>
-
       <q-card bordered flat class="q-px-md no-wrap row">
         <div class="col-12 text-subtitle2 row items-center">
           <span class="text-weight-medium text-dark">สอบไม่ผ่าน</span>
@@ -184,6 +195,24 @@ watch(
     </div>
     <q-space />
     <div class="items-center q-gutter-sm" style="display: flex">
+      <q-select
+        v-if="conclude"
+        dense
+        outlined
+        :options="optionsStatus"
+        option-value="value"
+        option-label="label"
+        label="ผลการสอบ"
+        map-options
+        emit-value
+        style="min-width: 140px"
+        :clearable="examResult !== ''"
+        @clear="examResult = ''"
+        v-model="examResult"
+        @update:model-value="
+          nornmalData ? props.onSearch?.() : getList('enter')
+        "
+      />
       <!-- ค้นหาข้อความใน table -->
       <q-input
         standout
diff --git a/src/modules/03_recruiting/views/01_compete/Detail.vue b/src/modules/03_recruiting/views/01_compete/Detail.vue
index 903288539..703aa73a1 100644
--- a/src/modules/03_recruiting/views/01_compete/Detail.vue
+++ b/src/modules/03_recruiting/views/01_compete/Detail.vue
@@ -42,6 +42,7 @@ const rows = ref<any[]>([]);
 const rowsData = ref<any[]>([]);
 const importId = ref<string>(route.params.id as string); // Period Import Id
 const filter = ref<string>(""); //search data table
+const examResult = ref<string>(""); // สถานะการสอบ
 const visibleColumns = ref<String[]>([
   "examID",
   "profileID",
@@ -60,7 +61,7 @@ const visibleColumns = ref<String[]>([
   "examAttribute",
   "examScore",
   "examResult",
-  "exam_order",
+  "number",
   "applyDate",
 ]);
 const columns = ref<QTableProps["columns"]>([
@@ -68,21 +69,16 @@ const columns = ref<QTableProps["columns"]>([
     name: "examID",
     align: "left",
     label: "เลขประจำตัวสอบ",
-    sortable: true,
+    sortable: false,
     field: "examID",
     headerStyle: "font-size: 14px; min-width: 20px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, {
-        numeric: true,
-        sensitivity: "base",
-      }),
   },
   {
     name: "profileID",
     align: "left",
     label: "เลขประจำตัวประชาชน",
-    sortable: true,
+    sortable: false,
     field: "profileID",
     headerStyle: "font-size: 14px; min-width: 20px",
     style: "font-size: 14px; ",
@@ -91,7 +87,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "fullName",
     align: "left",
     label: "ชื่อ-นามสกุล",
-    sortable: true,
+    sortable: false,
     field: "personName",
     headerStyle: "font-size: 14px; min-width: 250px",
     style: "font-size: 14px; ",
@@ -100,7 +96,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "hddPosition",
     align: "left",
     label: "บัญชีสอบ",
-    sortable: true,
+    sortable: false,
     field: "hddPosition",
     headerStyle: "font-size: 14px; min-width: 250px",
     style: "font-size: 14px; ",
@@ -109,161 +105,106 @@ const columns = ref<QTableProps["columns"]>([
     name: "dateOfBirth",
     align: "left",
     label: "วัน เดือน ปีเกิด",
-    sortable: true,
+    sortable: false,
     field: "dateOfBirth",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, {
-        numeric: true,
-        sensitivity: "base",
-      }),
   },
   {
     name: "gender",
     align: "left",
     label: "เพศ",
-    sortable: true,
+    sortable: false,
     field: "gender",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, {
-        numeric: true,
-        sensitivity: "base",
-      }),
   },
   {
     name: "position_name",
     align: "left",
     label: "ตำแหน่งที่สมัคร",
-    sortable: true,
+    sortable: false,
     field: "position_name",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, {
-        numeric: true,
-        sensitivity: "base",
-      }),
   },
   {
     name: "position_type",
     align: "left",
     label: "ประเภทที่สมัคร",
-    sortable: true,
+    sortable: false,
     field: "position_type",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, {
-        numeric: true,
-        sensitivity: "base",
-      }),
   },
   {
     name: "position_level",
     align: "left",
     label: "ระดับที่สมัคร",
-    sortable: true,
+    sortable: false,
     field: "position_level",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, {
-        numeric: true,
-        sensitivity: "base",
-      }),
   },
   {
     name: "university",
     align: "left",
     label: "สถานศึกษา",
-    sortable: true,
+    sortable: false,
     field: "university",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, {
-        numeric: true,
-        sensitivity: "base",
-      }),
   },
   {
     name: "degree",
     align: "left",
     label: "วุฒิการศึกษา",
-    sortable: true,
+    sortable: false,
     field: "degree",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, {
-        numeric: true,
-        sensitivity: "base",
-      }),
   },
   {
     name: "major",
     align: "left",
     label: "สาขาวิชาเอก",
-    sortable: true,
+    sortable: false,
     field: "major",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, {
-        numeric: true,
-        sensitivity: "base",
-      }),
   },
   {
     name: "certificateNo",
     align: "left",
     label: "เลขที่ใบประกอบวิชาชีพ",
-    sortable: true,
+    sortable: false,
     field: "certificateNo",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, {
-        numeric: true,
-        sensitivity: "base",
-      }),
   },
   {
     name: "certificateIssueDate",
     align: "left",
     label: "วันที่ได้รับใบประกอบวิชาชีพฯ",
-    sortable: true,
+    sortable: false,
     field: "certificateIssueDate",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, {
-        numeric: true,
-        sensitivity: "base",
-      }),
   },
   {
     name: "examAttribute",
     align: "left",
     label: "สถานะการคัดกรองคุณสมบัติ",
-    sortable: true,
+    sortable: false,
     field: "examAttribute",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, {
-        numeric: true,
-        sensitivity: "base",
-      }),
   },
   {
     name: "examScore",
     align: "left",
     label: "คะแนนรวม",
-    sortable: true,
+    sortable: false,
     field: "examScore",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -276,18 +217,13 @@ const columns = ref<QTableProps["columns"]>([
     field: "examResult",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, {
-        numeric: true,
-        sensitivity: "base",
-      }),
   },
   {
-    name: "exam_order",
+    name: "number",
     align: "center",
     label: "ลำดับที่สอบได้",
-    sortable: true,
-    field: "exam_order",
+    sortable: false,
+    field: "number",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -295,15 +231,10 @@ const columns = ref<QTableProps["columns"]>([
     name: "applyDate",
     align: "left",
     label: "วันที่สมัครสอบ",
-    sortable: true,
+    sortable: false,
     field: "applyDate",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, {
-        numeric: true,
-        sensitivity: "base",
-      }),
   },
 ]);
 const modalCandidates = ref(false); // dialog บรรจุผู้ผ่านการสอบแข่งขัน
@@ -369,7 +300,7 @@ async function fetchData() {
     .post(config.API.getExamResultById(importId.value), {
       examAttribute: "",
       keyword: filter.value,
-      examResult: "",
+      examResult: examResult.value ? examResult.value : "",
       page: initialPagination.value.page,
       pageSize: initialPagination.value.rowsPerPage,
     })
@@ -535,6 +466,7 @@ onMounted(async () => {
         v-model:totalList="totalList"
         v-model:total="total"
         v-model:pagination="initialPagination"
+        v-model:exam-result="examResult"
         :nornmalData="false"
         :conclude="true"
         :fetchData="fetchData"
@@ -582,8 +514,8 @@ onMounted(async () => {
               <div v-else-if="col.name == 'c5'">
                 <q-checkbox disable v-model="props.row.c5" />
               </div>
-              <div v-else-if="col.name == 'exam_order'">
-                {{ col.value ? col.value : " " }}
+              <div v-else-if="col.name == 'number'">
+                {{ col.value ? col.value : "" }}
               </div>
               <div v-else>
                 {{ col.value ? col.value : "-" }}
diff --git a/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue b/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue
index 04ea13ceb..10aeb9776 100644
--- a/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue
+++ b/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue
@@ -43,6 +43,7 @@ const totalList = ref<number>(0);
 const importId = ref<string>(route.params.id as string); // Period Import Id
 
 const filter = ref<string>(""); //search data table
+const examResult = ref<string>(""); // กรองผลการสอบ
 const visibleColumns = ref<String[]>([
   "examID",
   "profileID",
@@ -59,7 +60,7 @@ const visibleColumns = ref<String[]>([
   "examAttribute",
   "examScore",
   "examResult",
-  "exam_order",
+  "number",
   "applyDate",
 ]);
 const columns = ref<QTableProps["columns"]>([
@@ -67,18 +68,16 @@ const columns = ref<QTableProps["columns"]>([
     name: "examID",
     align: "left",
     label: "เลขประจำตัวสอบ",
-    sortable: true,
+    sortable: false,
     field: "examID",
     headerStyle: "font-size: 14px; min-width: 20px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "profileID",
     align: "left",
     label: "เลขประจำตัวประชาชน",
-    sortable: true,
+    sortable: false,
     field: "profileID",
     headerStyle: "font-size: 14px; min-width: 20px",
     style: "font-size: 14px; ",
@@ -87,7 +86,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "fullName",
     align: "left",
     label: "ชื่อ-นามสกุล",
-    sortable: true,
+    sortable: false,
     field: "personName",
     headerStyle: "font-size: 14px; min-width: 250px",
     style: "font-size: 14px; ",
@@ -96,7 +95,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "hddPosition",
     align: "left",
     label: "บัญชีสอบ",
-    sortable: true,
+    sortable: false,
     field: "hddPosition",
     headerStyle: "font-size: 14px; min-width: 250px",
     style: "font-size: 14px; ",
@@ -105,106 +104,88 @@ const columns = ref<QTableProps["columns"]>([
     name: "dateOfBirth",
     align: "left",
     label: "วัน เดือน ปีเกิด",
-    sortable: true,
+    sortable: false,
     field: "dateOfBirth",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "gender",
     align: "left",
     label: "เพศ",
-    sortable: true,
+    sortable: false,
     field: "gender",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "position_name",
     align: "left",
     label: "ตำแหน่งที่สมัคร",
-    sortable: true,
+    sortable: false,
     field: "position_name",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "university",
     align: "left",
     label: "สถานศึกษา",
-    sortable: true,
+    sortable: false,
     field: "university",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "degree",
     align: "left",
     label: "วุฒิการศึกษา",
-    sortable: true,
+    sortable: false,
     field: "degree",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "major",
     align: "left",
     label: "สาขาวิชาเอก",
-    sortable: true,
+    sortable: false,
     field: "major",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "certificateNo",
     align: "left",
     label: "เลขที่ใบประกอบวิชาชีพ",
-    sortable: true,
+    sortable: false,
     field: "certificateNo",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "certificateIssueDate",
     align: "left",
     label: "วันที่ได้รับใบประกอบวิชาชีพฯ",
-    sortable: true,
+    sortable: false,
     field: "certificateIssueDate",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "examAttribute",
     align: "left",
     label: "สถานะการคัดกรองคุณสมบัติ",
-    sortable: true,
+    sortable: false,
     field: "examAttribute",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "examScore",
     align: "left",
     label: "คะแนนรวม",
-    sortable: true,
+    sortable: false,
     field: "examScore",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -213,19 +194,17 @@ const columns = ref<QTableProps["columns"]>([
     name: "examResult",
     align: "left",
     label: "ผลการสอบ",
-    sortable: true,
+    sortable: false,
     field: "examResult",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
-    name: "exam_order",
+    name: "number",
     align: "center",
     label: "ลำดับที่สอบได้",
-    sortable: true,
-    field: "exam_order",
+    sortable: false,
+    field: "number",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -233,12 +212,10 @@ const columns = ref<QTableProps["columns"]>([
     name: "applyDate",
     align: "left",
     label: "วันที่สมัครสอบ",
-    sortable: true,
+    sortable: false,
     field: "applyDate",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
 ]);
 const rows = ref<RecruitDetailResponse[]>([]);
@@ -310,7 +287,7 @@ async function fetchData() {
     .post(config.API.getDisableExamResultById(importId.value), {
       examAttribute: "",
       keyword: filter.value,
-      examResult: "",
+      examResult: examResult.value ? examResult.value : "",
       page: initialPagination.value.page,
       pageSize: initialPagination.value.rowsPerPage,
     })
@@ -469,6 +446,7 @@ onMounted(async () => {
         v-model:inputfilter="filter"
         v-model:total="total"
         v-model:inputvisible="visibleColumns"
+        v-model:exam-result="examResult"
         :nornmalData="false"
         :conclude="true"
         :fetchData="fetchData"
@@ -516,8 +494,8 @@ onMounted(async () => {
               <div v-else-if="col.name == 'c5'">
                 <q-checkbox disable v-model="props.row.c5" />
               </div>
-              <div v-else-if="col.name == 'exam_order'">
-                {{ col.value ? col.value : " " }}
+              <div v-else-if="col.name == 'number'">
+                {{ col.value ? col.value : "" }}
               </div>
               <div v-else>
                 {{ col.value ? col.value : "-" }}

From 77202be2240aca4704a68fb8fe01289b85d7804f Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 17 Oct 2025 11:04:59 +0700
Subject: [PATCH 3/5] fix: clear row = []

---
 src/modules/03_recruiting/components/Table.vue        | 9 ++++++---
 src/modules/03_recruiting/interface/index/Main.ts     | 6 ++++++
 src/modules/03_recruiting/views/01_compete/Detail.vue | 6 +++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/modules/03_recruiting/components/Table.vue b/src/modules/03_recruiting/components/Table.vue
index 847679f5c..b5f2877f6 100644
--- a/src/modules/03_recruiting/components/Table.vue
+++ b/src/modules/03_recruiting/components/Table.vue
@@ -1,7 +1,10 @@
 <script setup lang="ts">
 import { checkPermission } from "@/utils/permissions";
 import { ref, useAttrs, watch } from "vue";
-import type { Pagination } from "@/modules/03_recruiting/interface/index/Main";
+import type {
+  Pagination,
+  ExamResultOption,
+} from "@/modules/03_recruiting/interface/index/Main";
 
 const attrs = ref<any>(useAttrs());
 const table = ref<any>(null);
@@ -48,9 +51,9 @@ const props = defineProps({
   },
 });
 
-const optionsStatus = ref<any[]>([
+const optionsStatus = ref<ExamResultOption[]>([
   { label: "ทั้งหมด", value: "" },
-  { label: "ขส.", value: "missed_exam" },
+  { label: "ขาดสอบ", value: "missed_exam" },
   { label: "ผ่าน", value: "pass" },
   { label: "ไม่ผ่าน", value: "notpass" },
 ]);
diff --git a/src/modules/03_recruiting/interface/index/Main.ts b/src/modules/03_recruiting/interface/index/Main.ts
index 9fd26f0e7..fe511b17b 100644
--- a/src/modules/03_recruiting/interface/index/Main.ts
+++ b/src/modules/03_recruiting/interface/index/Main.ts
@@ -15,6 +15,11 @@ interface ChangeActive {
   id: number;
 }
 
+interface ExamResultOption {
+  label: string;
+  value: string;
+}
+
 //ข้อมูลส่วนตัว
 interface Information {
   cardid: string | null;
@@ -292,4 +297,5 @@ export type {
   AddressWeb,
   EnableType,
   CmsTable,
+  ExamResultOption,
 };
diff --git a/src/modules/03_recruiting/views/01_compete/Detail.vue b/src/modules/03_recruiting/views/01_compete/Detail.vue
index 703aa73a1..ce46b2d2d 100644
--- a/src/modules/03_recruiting/views/01_compete/Detail.vue
+++ b/src/modules/03_recruiting/views/01_compete/Detail.vue
@@ -324,17 +324,17 @@ async function fetchData() {
       }
 
       const data = res.data.result.data;
+      let result: RecruitDetailResponse[] = [];
       if (data.length > 0) {
-        let result: RecruitDetailResponse[] = [];
         if (data.length > 0) {
           data.map((r: RecruitDetailResponse) => {
             r.personName = `${r.prefix}${r.fullName}`;
             result.push(r);
           });
         }
-        rows.value = result;
-        rowsData.value = result;
       }
+      rows.value = result;
+      rowsData.value = result;
     })
     .catch((e) => {
       messageError($q, e);

From 0a75b7ef868f967b16cbcf36db475f9e93e24a44 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 17 Oct 2025 15:17:17 +0700
Subject: [PATCH 4/5] fix(placement): delete min-date

---
 src/components/Dialogs/DialogOrgSelect.vue                   | 5 +++--
 src/components/Dialogs/DialogOrgSelectEmployee.vue           | 5 +++--
 .../05_placement/components/PersonalList/CardPosition.vue    | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/Dialogs/DialogOrgSelect.vue b/src/components/Dialogs/DialogOrgSelect.vue
index 56ac10518..5f81fb073 100644
--- a/src/components/Dialogs/DialogOrgSelect.vue
+++ b/src/components/Dialogs/DialogOrgSelect.vue
@@ -41,6 +41,7 @@ const {
   date2Thai,
   dialogMessageNotify,
   onSearchDataTable,
+  convertDateToAPI,
 } = mixin;
 
 /** props*/
@@ -508,7 +509,7 @@ function onSubmit() {
         posLevelId: selectedPos.value[0].posLevelId, //ชื่อตำแหน่ง
         posLevelName: selectedPos.value[0].posLevelName, //ชื่อตำแหน่ง
         posExecutiveName: selectedPos.value[0].posExecutiveName, //ชื่อตำแหน่ง
-        reportingDate: datePos.value,
+        reportingDate: convertDateToAPI(datePos.value),
         posmasterId: dataPosMaster.id,
         typeCommand: type.value,
         positionExecutiveField: selectedPos.value[0].positionExecutiveField, //ด้านทางการบริหาร
@@ -787,6 +788,7 @@ onMounted(async () => {
                         >
                           <div class="col-12">
                             <q-toolbar style="padding: 0px">
+                              <!-- :min-date="datePos" -->
                               <datepicker
                                 menu-class-name="modalfix"
                                 v-model="datePos"
@@ -795,7 +797,6 @@ onMounted(async () => {
                                 borderless
                                 :enableTimePicker="false"
                                 week-start="0"
-                                :min-date="datePos"
                               >
                                 <template #year="{ year }">
                                   {{ year + 543 }}
diff --git a/src/components/Dialogs/DialogOrgSelectEmployee.vue b/src/components/Dialogs/DialogOrgSelectEmployee.vue
index fde333830..e22af075a 100644
--- a/src/components/Dialogs/DialogOrgSelectEmployee.vue
+++ b/src/components/Dialogs/DialogOrgSelectEmployee.vue
@@ -41,6 +41,7 @@ const {
   date2Thai,
   dialogMessageNotify,
   onSearchDataTable,
+  convertDateToAPI,
 } = mixin;
 
 const route = useRoute();
@@ -480,7 +481,7 @@ function onSubmit() {
         posTypeName: selectedPos.value[0].posTypeName, //ชื่อตำแหน่ง
         posLevelId: selectedPos.value[0].posLevelId, //ชื่อตำแหน่ง
         posLevelName: selectedPos.value[0].posLevelName, //ชื่อตำแหน่ง
-        reportingDate: datePos.value,
+        reportingDate: convertDateToAPI(datePos.value),
         posmasterId: dataPosMaster.id,
         typeCommand: type.value,
       };
@@ -755,6 +756,7 @@ onMounted(() => {
                         >
                           <div class="col-12">
                             <q-toolbar style="padding: 0px">
+                              <!-- :min-date="datePos" -->
                               <datepicker
                                 menu-class-name="modalfix"
                                 v-model="datePos"
@@ -763,7 +765,6 @@ onMounted(() => {
                                 borderless
                                 :enableTimePicker="false"
                                 week-start="0"
-                                :min-date="datePos"
                               >
                                 <template #year="{ year }">
                                   {{ year + 543 }}
diff --git a/src/modules/05_placement/components/PersonalList/CardPosition.vue b/src/modules/05_placement/components/PersonalList/CardPosition.vue
index f26733d93..4c9b0a277 100644
--- a/src/modules/05_placement/components/PersonalList/CardPosition.vue
+++ b/src/modules/05_placement/components/PersonalList/CardPosition.vue
@@ -481,6 +481,7 @@ onMounted(async () => {
           >
             <div class="col-12">
               <q-toolbar style="padding: 0px">
+                <!-- :min-date="date" -->
                 <datepicker
                   menu-class-name="modalfix"
                   v-model="date"
@@ -489,7 +490,6 @@ onMounted(async () => {
                   borderless
                   :enableTimePicker="false"
                   week-start="0"
-                  :min-date="date"
                 >
                   <template #year="{ year }">
                     {{ year + 543 }}

From b178f5ad387b40f66a2d98e0471fe9e81f02e4ef Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 17 Oct 2025 17:44:14 +0700
Subject: [PATCH 5/5] fix(recruiting):comment  router.go(-1);

---
 src/modules/03_recruiting/views/01_compete/Detail.vue        | 2 +-
 src/modules/03_recruiting/views/02_qualify/DisableDetail.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/03_recruiting/views/01_compete/Detail.vue b/src/modules/03_recruiting/views/01_compete/Detail.vue
index ce46b2d2d..69ccbf399 100644
--- a/src/modules/03_recruiting/views/01_compete/Detail.vue
+++ b/src/modules/03_recruiting/views/01_compete/Detail.vue
@@ -375,7 +375,7 @@ function onSubmitCandidates(date: Date) {
         .then(() => {
           success($q, "นำผู้ผ่านสอบแข่งขันเข้าสู่ระบบบรรจุ");
           modalCandidates.value = false;
-          router.go(-1);
+          // router.go(-1);
         })
         .catch((e) => {
           messageError($q, e);
diff --git a/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue b/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue
index 10aeb9776..f0df46aef 100644
--- a/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue
+++ b/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue
@@ -346,7 +346,7 @@ async function onSubmitCandidates(date: Date) {
         .then(() => {
           success($q, "นำผู้ผ่านคัดเลือกคนพิการเข้าสู่ระบบบรรจุ");
           modalCandidates.value = false;
-          router.go(-1);
+          // router.go(-1);
         })
         .catch((e) => {
           messageError($q, e);