From 53191acf4f244f2234d83846779ee4aaf7538ead Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 26 Apr 2024 16:56:31 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1fi?=
 =?UTF-8?q?lter=20keyword?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/14_KPI/views/indicatorByPlan.vue |  2 +-
 src/modules/14_KPI/views/list.vue            | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/modules/14_KPI/views/indicatorByPlan.vue b/src/modules/14_KPI/views/indicatorByPlan.vue
index 679f17507..b757b46bb 100644
--- a/src/modules/14_KPI/views/indicatorByPlan.vue
+++ b/src/modules/14_KPI/views/indicatorByPlan.vue
@@ -328,6 +328,7 @@ onMounted(() => {
               ref="filterRef"
               outlined
               placeholder="ค้นหา"
+              @keydown.enter.prevent="fetchListProjectNew"
             >
               <template v-slot:append>
                 <q-icon v-if="nodeData.keyword == ''" name="search" />
@@ -363,7 +364,6 @@ onMounted(() => {
             :columns="columns"
             :rows="rows"
             row-key="subject"
-            :filter="nodeData.keyword"
             flat
             bordered
             dense
diff --git a/src/modules/14_KPI/views/list.vue b/src/modules/14_KPI/views/list.vue
index 0ee238754..335aaa731 100644
--- a/src/modules/14_KPI/views/list.vue
+++ b/src/modules/14_KPI/views/list.vue
@@ -244,7 +244,18 @@ onMounted(async () => {
               dense
               v-model="filterKeyword"
               label="ค้นหา"
-            ></q-input>
+              @keydown.enter.prevent="changRound"
+            >
+              <template v-slot:append>
+                <q-icon
+                  v-if="filterKeyword !== ''"
+                  name="clear"
+                  class="cursor-pointer"
+                  @click="(filterKeyword = ''), changRound()"
+                />
+                <q-icon v-else name="search" color="grey-5" />
+              </template>
+            </q-input>
             <q-select
               v-model="visibleColumns"
               multiple
@@ -266,7 +277,6 @@ onMounted(async () => {
             ref="table"
             :columns="columns"
             :rows="rows"
-            :filter="filterKeyword"
             row-key="id"
             flat
             bordered