From 1864033938195088ad75da77661f5355e00c1369 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 24 Jun 2025 13:18:41 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=84=E0=B9=89=E0=B8=99=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=84=E0=B8=99=E0=B8=84=E0=B8=A3=E0=B8=AD=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DialogSelectPerson.vue         | 28 +++++++++++++------
 .../components/DialogSelectPerson.vue         | 15 ++++++----
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/modules/16_positionEmployee/components/DialogSelectPerson.vue b/src/modules/16_positionEmployee/components/DialogSelectPerson.vue
index e1a171523..4d50cef94 100644
--- a/src/modules/16_positionEmployee/components/DialogSelectPerson.vue
+++ b/src/modules/16_positionEmployee/components/DialogSelectPerson.vue
@@ -536,6 +536,7 @@ watch(
                       label="ค้นหาจากชื่อ-นามสกุล หรือเลขประจำตัวประชาชน"
                       lazy-rules
                       hide-bottom-space
+                      @keydown.enter.prevent="getSearch()"
                     />
                   </div>
                   <div class="col-2">
@@ -549,6 +550,7 @@ watch(
                       label="ตำแหน่ง"
                       lazy-rules
                       hide-bottom-space
+                      @keydown.enter.prevent="getSearch()"
                     />
                   </div>
                   <div class="col-2">
@@ -560,20 +562,24 @@ watch(
                       :options="typeOps"
                       emit-value
                       dense
-                      @update:model-value="updateSelectType"
+                      @update:model-value="
+                        updateSelectType(formData.positionType), getSearch()
+                      "
                       map-options
                       outlined
                       option-label="name"
                       option-value="id"
                       lazy-rules
                       hide-bottom-space
-                      ><template v-if="formData.positionType" v-slot:append>
+                    >
+                      <template v-if="formData.positionType" v-slot:append>
                         <q-icon
                           name="cancel"
-                          @click.stop.prevent="clearPosition()"
+                          @click.stop.prevent="clearPosition(), getSearch()"
                           class="cursor-pointer"
-                        /> </template
-                    ></q-select>
+                        />
+                      </template>
+                    </q-select>
                   </div>
                   <div class="col-2">
                     <q-select
@@ -591,14 +597,18 @@ watch(
                       option-value="id"
                       lazy-rules
                       hide-bottom-space
+                      @update:model-value="getSearch()"
                     >
                       <template v-if="formData.positionLevel" v-slot:append>
                         <q-icon
                           name="cancel"
-                          @click.stop.prevent="formData.positionLevel = ''"
+                          @click.stop.prevent="
+                            (formData.positionLevel = ''), getSearch()
+                          "
                           class="cursor-pointer"
-                        /> </template
-                    ></q-select>
+                        />
+                      </template>
+                    </q-select>
                   </div>
                   <div class="col-2">
                     <q-btn
@@ -606,7 +616,7 @@ watch(
                       color="teal-5"
                       class="full-height"
                       icon="search"
-                      @click="getSearch()"
+                      @click.prevent="getSearch()"
                     />
                   </div>
 
diff --git a/src/modules/20_positionTemp/components/DialogSelectPerson.vue b/src/modules/20_positionTemp/components/DialogSelectPerson.vue
index 1e6413433..6498094be 100644
--- a/src/modules/20_positionTemp/components/DialogSelectPerson.vue
+++ b/src/modules/20_positionTemp/components/DialogSelectPerson.vue
@@ -534,6 +534,7 @@ watch(
                       label="ค้นหาจากชื่อ-นามสกุล หรือเลขประจำตัวประชาชน"
                       lazy-rules
                       hide-bottom-space
+                      @keydown.enter.prevent="getSearch()"
                     />
                   </div>
                   <div class="col-2">
@@ -547,6 +548,7 @@ watch(
                       label="ตำแหน่ง"
                       lazy-rules
                       hide-bottom-space
+                      @keydown.enter.prevent="getSearch()"
                     />
                   </div>
                   <div class="col-2">
@@ -564,13 +566,16 @@ watch(
                       option-value="id"
                       lazy-rules
                       hide-bottom-space
-                      ><template v-if="formData.positionType" v-slot:append>
+                      @update:model-value="getSearch()"
+                    >
+                      <template v-if="formData.positionType" v-slot:append>
                         <q-icon
                           name="cancel"
-                          @click.stop.prevent="clearPosition()"
+                          @click.stop.prevent="clearPosition(), getSearch()"
                           class="cursor-pointer"
-                        /> </template
-                    ></q-select>
+                        />
+                      </template>
+                    </q-select>
                   </div>
                   <!-- <div class="col-2">
                     <q-select
@@ -607,7 +612,7 @@ watch(
                       outline
                     />
                   </div>
-
+                  <q-space />
                   <q-select
                     for="#select"
                     v-model="visibleColumnsResult"