ปรับวินัย

src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue

@@ -129,10 +129,11 @@ const columns = ref<QTableProps["columns"]>([
 const openModal = () => (modal.value = true);
 const closeModal = () => (modal.value = false);
 
-const resetFilter = () => {
+function resetFilter(){
   filterKeyword.value = "";
   filterKeyword2.value = "";
   filterRef.value.focus();
+  getList()
 };
 
 const currentPage = ref<number>(1);
@@ -228,6 +229,10 @@ watch(
   }
 );
 
+function filterFn() {
+  getList();
+}
+
 /** เรียกใช้งานเมื่อเริ่มหน้าเว็ป */
 onMounted(() => {
   getList();
@@ -257,25 +262,27 @@ onMounted(() => {
           <q-space />
 
           <q-input
-            class="col-xs-12 col-sm-3 col-md-2"
-            standout
-            dense
-            v-model="filterKeyword"
-            ref="filterRef"
-            outlined
-            debounce="300"
-            placeholder="ค้นหา"
-          >
-            <template v-slot:append>
-              <q-icon v-if="filterKeyword == ''" name="search" />
-              <q-icon
-                v-if="filterKeyword !== ''"
-                name="clear"
-                class="cursor-pointer"
-                @click="resetFilter"
-              />
-            </template>
-          </q-input>
+        for="#search"
+        class="col-xs-12 col-sm-3 col-md-2"
+        standout
+        dense
+        v-model="filterKeyword"
+        ref="filterRef"
+        outlined
+        debounce="300"
+        placeholder="ค้นหา"
+        @keydown.enter.prevent="filterFn"
+      >
+        <template v-slot:append>
+          <q-icon v-if="filterKeyword == ''" name="search" />
+          <q-icon
+            v-if="filterKeyword !== ''"
+            name="clear"
+            class="cursor-pointer"
+            @click="resetFilter"
+          />
+        </template>
+      </q-input>
 
           <q-select
             v-model="dataStore.visibleColumns"
@@ -298,7 +305,6 @@ onMounted(() => {
           <d-table
             :columns="dataStore.columns"
             :rows="dataStore.rows"
-            :filter="filterKeyword"
             row-key="id"
             :visible-columns="dataStore.visibleColumns"
             v-model:pagination="pagination"