From cb05d3275e91685ac8efe126aed5c78c9f61e214 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 9 Jan 2024 14:38:13 +0700
Subject: [PATCH] =?UTF-8?q?filter=20keyword=20=E0=B8=9B=E0=B8=A3=E0=B8=B0?=
 =?UTF-8?q?=E0=B9=80=E0=B8=A1=E0=B8=B4=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../06_evaluate/components/TableListEvaluate.vue |  1 -
 src/modules/06_evaluate/views/EvaluateMain.vue   | 16 +++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/modules/06_evaluate/components/TableListEvaluate.vue b/src/modules/06_evaluate/components/TableListEvaluate.vue
index f07279e..fff7ae7 100644
--- a/src/modules/06_evaluate/components/TableListEvaluate.vue
+++ b/src/modules/06_evaluate/components/TableListEvaluate.vue
@@ -128,7 +128,6 @@ watch([() => currentPage.value, () => pagination.value.rowsPerPage], () => {
     dense
     :rows-per-page-options="[10, 25, 50, 100]"
     :visible-columns="store.visibleColumns"
-    :filter="store.filterKeyword"
     v-model:pagination="pagination"
     @update:pagination="updateRowsPerPagen"
   >
diff --git a/src/modules/06_evaluate/views/EvaluateMain.vue b/src/modules/06_evaluate/views/EvaluateMain.vue
index dc56add..1576529 100644
--- a/src/modules/06_evaluate/views/EvaluateMain.vue
+++ b/src/modules/06_evaluate/views/EvaluateMain.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, onMounted } from "vue";
+import { ref, watch, onMounted } from "vue";
 import { useQuasar } from "quasar";
 import { useRouter } from "vue-router";
 import http from "@/plugins/http";
@@ -58,7 +58,7 @@ async function fetchEvaluteList() {
   await http
     .get(
       config.API.evaluationList() +
-        `?page=${page.value}&pageSize=${pageSize.value}`
+        `?page=${page.value}&pageSize=${pageSize.value}&keyword=${store.filterKeyword}`
     )
     .then((res) => {
       maxPage.value = Math.ceil(res.data.result.total / pageSize.value);
@@ -84,6 +84,16 @@ async function updatePaging(newPagination: any, currentPage: number) {
   await fetchEvaluteList();
 }
 
+watch(
+  () => store.filterKeyword,
+  async () => {
+    page.value = 1;
+    pageSize.value = pageSize.value;
+
+    await fetchEvaluteList();
+  }
+);
+
 /** hook lifecycle*/
 onMounted(async () => {
   await fetchEvaluteList();
@@ -137,7 +147,7 @@ onMounted(async () => {
                 outlined
                 v-model="store.filterKeyword"
                 label="ค้นหา"
-                debounce="300"
+                debounce="500"
               >
                 <template v-slot:append>
                   <q-icon name="search" />