From fb31893ecc621b7e8cfde8eba4f7f8e7aaa39603 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 7 May 2025 18:08:44 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=9C=E0=B8=B4=E0=B8=94=20=E0=B9=80?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=84=E0=B8=B7=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/07_insignia/components/7_Reclaim/DialogForm.vue | 6 +++---
 src/modules/07_insignia/views/07_ReclaimMain.vue            | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/modules/07_insignia/components/7_Reclaim/DialogForm.vue b/src/modules/07_insignia/components/7_Reclaim/DialogForm.vue
index eafe5605f..da5b6d4fe 100644
--- a/src/modules/07_insignia/components/7_Reclaim/DialogForm.vue
+++ b/src/modules/07_insignia/components/7_Reclaim/DialogForm.vue
@@ -106,7 +106,7 @@ const columns = ref<QTableColumn[]>([
   {
     name: "requestInsignia",
     align: "left",
-    label: "เครื่องราชๆ",
+    label: "เครื่องราชฯ",
     field: "requestInsignia",
     format(val, row) {
       return `${row.requestInsignia ?? ""}
@@ -247,7 +247,6 @@ watch(modal, (val) => {
 
     if (isEdit.value) {
       const data = props.insigniaReclaimData;
-      console.log(props.insigniaReclaimData);
       fullName.value = data ? data?.fullName : "";
       cardid.value = data ? data.citizenId : "";
       insigniaType.value = data
@@ -320,6 +319,7 @@ watch(modal, (val) => {
                   :rows-per-page-options="[10, 25, 50, 100]"
                   selection="single"
                   v-model:selected="selected"
+                  :visible-columns="visibleColumns"
                 >
                   <template v-slot:header="props">
                     <q-tr :props="props">
@@ -416,7 +416,7 @@ watch(modal, (val) => {
                 </div>
 
                 <div class="col-12 q-mt-md text-weight-bold text-grey-7">
-                  รายละเอียดการเรียกคือเครื่องราชฯ
+                  รายละเอียดการเรียกคืนเครื่องราชฯ
                 </div>
                 <div class="col-xs-12 col-sm-6">
                   <q-input
diff --git a/src/modules/07_insignia/views/07_ReclaimMain.vue b/src/modules/07_insignia/views/07_ReclaimMain.vue
index 8d898ca5b..8d9116d7c 100644
--- a/src/modules/07_insignia/views/07_ReclaimMain.vue
+++ b/src/modules/07_insignia/views/07_ReclaimMain.vue
@@ -330,7 +330,8 @@ function onSearchDataReclaim() {
   } else if (insigniaType.value === "all" && employeeType.value !== "all") {
     const data = rowsMain.value.filter(
       (e: DataReclaim) =>
-        e.profileType === employeeType.value.toLocaleUpperCase()
+        e.profileType.toLocaleUpperCase() ===
+        employeeType.value.toLocaleUpperCase()
     );
     rows.value = onSearchDataTable(
       keyword.value,