From 24b9bfe2febc72034d7098cf95231503115ac634 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 24 Feb 2025 15:27:03 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=A7=E0=B8=B8=E0=B8=92=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A8=E0=B8=B6=E0=B8=81=E0=B8=A9?=
 =?UTF-8?q?=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../21_report/views/02_reportRegistry.vue     | 45 ++++++++++++++-----
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/src/modules/21_report/views/02_reportRegistry.vue b/src/modules/21_report/views/02_reportRegistry.vue
index 3b118433a..aefc97908 100644
--- a/src/modules/21_report/views/02_reportRegistry.vue
+++ b/src/modules/21_report/views/02_reportRegistry.vue
@@ -502,7 +502,7 @@ async function onSearch() {
     positionExecutive: positionExecutive.value,
     gender: gender.value,
     status: status.value,
-    education: education.value,
+    education: education.value.trim(),
     ageMin: rangeAge.value.min,
     ageMax: rangeAge.value.max,
     dateStart: dateStart.value ?? null,
@@ -1169,7 +1169,24 @@ onMounted(async () => {
                     </div>
                     <div class="col-12"><q-separator /></div>
                     <div class="col-12 q-px-sm">
-                      <q-select
+                      <q-input
+                        dense
+                        v-model="education"
+                        autogrow
+                        borderless
+                        label="วุฒิการศึกษา"
+                        class="bg-white full-width"
+                      >
+                        <template v-if="education" v-slot:append>
+                          <q-icon
+                            name="cancel"
+                            @click.stop.prevent="education = ''"
+                            class="cursor-pointer"
+                            style="opacity: 0.6"
+                          />
+                        </template>
+                      </q-input>
+                      <!-- <q-select
                         label="วุฒิการศึกษา"
                         :model-value="education == '' ? 'ทั้งหมด' : education"
                         :options="educationOp"
@@ -1201,7 +1218,7 @@ onMounted(async () => {
                             style="opacity: 0.6"
                           />
                         </template>
-                      </q-select>
+                      </q-select> -->
                     </div>
                     <div class="col-12"><q-separator /></div>
                     <div class="col-12 q-pa-sm">
@@ -1463,15 +1480,13 @@ onMounted(async () => {
             <div class="col-lg-9 col-md-9 col-sm-9 col-xs-12 col-xs-12 flex">
               <q-card bordered class="col-12">
                 <div class="row col-12 q-pa-sm items-center">
-                  <div
-                    class="row items-center q-pa-sm no-wrap bg-grey-1"
-                    style="border: #c8d3db solid 1px; border-radius: 3px"
-                  >
-                    <div class="text-weight-medium q-pr-md">
-                      จำนวนที่พบทั้งหมด
-                    </div>
+                  <div class="row items-center q-pa-sm no-wrap">
+                    <div class="q-pr-md">จำนวนที่พบทั้งหมด</div>
                     <q-space />
-                    <q-badge color="primary" class="q-pa-xs">
+                    <q-badge
+                      class="q-pa-xs text-primary text-bold text-subtitle2"
+                      color="white"
+                    >
                       {{ total.toLocaleString() }}
                     </q-badge>
                   </div>
@@ -1567,7 +1582,13 @@ onMounted(async () => {
                             <q-tooltip>ทะเบียนประวัติ</q-tooltip>
                           </q-btn>
                         </div>
-                        <div v-else class="table_ellipsis">
+                        <div
+                          v-else-if="col.name === 'org'"
+                          class="table_ellipsis"
+                        >
+                          {{ col.value ? col.value : "-" }}
+                        </div>
+                        <div v-else>
                           {{ col.value ? col.value : "-" }}
                         </div>
                       </q-td>