From bb14e16c5ede59cd1bb0d1db1690d28860a3f2d4 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 30 Sep 2024 16:57:48 +0700
Subject: [PATCH] fix

---
 src/modules/02_transfer/views/Main.vue  | 6 +++---
 src/modules/13_portfolio/views/Main.vue | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/modules/02_transfer/views/Main.vue b/src/modules/02_transfer/views/Main.vue
index b9010e6..b4c20b1 100644
--- a/src/modules/02_transfer/views/Main.vue
+++ b/src/modules/02_transfer/views/Main.vue
@@ -120,7 +120,7 @@ const columns = ref<QTableProps["columns"]>([
 async function fecthListTransfer() {
   showLoader();
   await http
-    .get(config.API.listUserTransfer() + `?keyword=${filter.value}`)
+    .get(config.API.listUserTransfer())
     .then((res) => {
       let data = res.data.result;
       rows.value = data.map((e: TransferList) => ({
@@ -208,7 +208,6 @@ onMounted(async () => {
                 debounce="300"
                 placeholder="ค้นหา"
                 style="max-width: 200px"
-                @keydown.enter.prevent="fecthListTransfer()"
               >
                 <template v-slot:append>
                   <q-icon v-if="filter == ''" name="search" />
@@ -216,7 +215,7 @@ onMounted(async () => {
                     v-if="filter !== ''"
                     name="clear"
                     class="cursor-pointer"
-                    @click="(filter = ''), fecthListTransfer()"
+                    @click="filter = ''"
                   />
                 </template>
               </q-input>
@@ -253,6 +252,7 @@ onMounted(async () => {
               :visible-columns="visibleColumns"
               :rows-per-page-options="[10, 25, 50, 100]"
               v-model:pagination="pagination"
+              :filter="filter"
             >
               <template v-slot:pagination="scope">
                 ทั้งหมด {{ rows.length }} รายการ
diff --git a/src/modules/13_portfolio/views/Main.vue b/src/modules/13_portfolio/views/Main.vue
index 87c60de..a12a76a 100644
--- a/src/modules/13_portfolio/views/Main.vue
+++ b/src/modules/13_portfolio/views/Main.vue
@@ -60,7 +60,7 @@ const columns = ref<QTableProps["columns"]>([
 async function fecthList() {
   showLoader();
   await http
-    .get(config.API.portfolio+`?keyword=${filter.value}`)
+    .get(config.API.portfolio)
     .then((res) => {
       rows.value = res.data.result;
     })
@@ -157,7 +157,6 @@ onMounted(async () => {
                 debounce="300"
                 placeholder="ค้นหา"
                 style="max-width: 200px"
-                @keydown.enter.prevent="fecthList()"
               >
                 <template v-slot:append>
                   <q-icon v-if="filter == ''" name="search" />
@@ -165,7 +164,7 @@ onMounted(async () => {
                     v-if="filter !== ''"
                     name="clear"
                     class="cursor-pointer"
-                    @click="filter = '',fecthList()"
+                    @click="filter = ''"
                   />
                 </template>
               </q-input>
@@ -202,6 +201,7 @@ onMounted(async () => {
               :visible-columns="visibleColumns"
               :rows-per-page-options="[10, 25, 50, 100]"
               v-model:pagination="pagination"
+              :filter="filter"
             >
               <template v-slot:pagination="scope">
                 ทั้งหมด {{ rows.length }} รายการ