แก้ฟิลเตอร์ จากล่างขึ้นบนถึง พ้นราชการ

src/modules/07_insignia/components/2_Manage/Tab1.vue

@@ -41,6 +41,7 @@ const {
   messageError,
   success,
   dialogMessageNotify,
+  onSearchDataTable,
 } = mixin;
 
 /**
@@ -795,6 +796,14 @@ watch(
   }
 );
 
+function onSearch() {
+  DataStore.rows = onSearchDataTable(
+    filterKeyword.value,
+    DataStore.rowsData,
+    columns.value ? columns.value : []
+  );
+}
+
 /** Hook*/
 onMounted(async () => {
   filterOrganizationOP.value = await DataStore.optionsTypeOc;
@@ -853,6 +862,7 @@ onMounted(async () => {
           outlined
           debounce="300"
           placeholder="ค้นหา"
+          @keydown.enter="onSearch"
         >
           <template v-slot:append>
             <q-icon name="search" />
@@ -1010,7 +1020,6 @@ onMounted(async () => {
           ref="table"
           :columns="columns"
           :rows="DataStore.rows"
-          :filter="filterKeyword"
           row-key="name"
           flat
           bordered

src/modules/07_insignia/components/2_Manage/Tab2.vue

@@ -4,6 +4,7 @@ import { onMounted, ref, watch } from "vue";
 import { checkPermission } from "@/utils/permissions";
 import { useInsigniaDataStore } from "@/modules/07_insignia/store";
 import { useroleUserDataStore } from "@/stores/roleUser";
+import { useCounterMixin } from "@/stores/mixin";
 
 /** import Type*/
 import type { QTableProps } from "quasar";
@@ -13,6 +14,8 @@ import type { OptionData } from "@/modules/07_insignia/interface/index/Main";
 import DialogInformation from "@/components/Dialogs/Information.vue";
 import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
 
+const mixin = useCounterMixin()
+const { onSearchDataTable } = mixin
 /** useStore*/
 const roleDataStore = useroleUserDataStore();
 const DataStore = useInsigniaDataStore();
@@ -254,6 +257,14 @@ function clearInsigniaFilters(name: string) {
   }
 }
 
+function onSearch() {
+  DataStore.rows = onSearchDataTable(
+    filterKeyword.value,
+    DataStore.rowsData,
+    columns.value ? columns.value : []
+  );
+}
+
 /*** Hook*/
 onMounted(async () => {
   filterOrganizationOP.value = await DataStore.optionsTypeOc;
@@ -316,6 +327,7 @@ watch(
           outlined
           debounce="300"
           placeholder="ค้นหา"
+          @keydown.enter="onSearch"
         >
           <template v-slot:append>
             <q-icon name="search" />
@@ -440,7 +452,6 @@ watch(
           ref="table"
           :columns="columns"
           :rows="DataStore.rows"
-          :filter="filterKeyword"
           row-key="name"
           flat
           bordered

src/modules/07_insignia/components/2_Manage/Tab3.vue

@@ -3,6 +3,7 @@ import { onMounted, ref, watch } from "vue";
 
 import { checkPermission } from "@/utils/permissions";
 import { useInsigniaDataStore } from "@/modules/07_insignia/store";
+import { useCounterMixin } from "@/stores/mixin";
 
 /** import Type*/
 import type { QTableProps } from "quasar";
@@ -12,6 +13,8 @@ import type { OptionData } from "@/modules/07_insignia/interface/index/Main";
 import DialogInformation from "@/components/Dialogs/Information.vue";
 import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
 
+const mixin = useCounterMixin();
+const { onSearchDataTable } = mixin;
 /** useStore*/
 const DataStore = useInsigniaDataStore();
 
@@ -251,6 +254,22 @@ function clearInsigniaFilters(name: string) {
   }
 }
 
+function onSearch() {
+  DataStore.rows = onSearchDataTable(
+    filterKeyword.value,
+    DataStore.rowsData,
+    columns.value ? columns.value : []
+  );
+}
+
+watch(
+  () => DataStore.typeOc,
+  async () => {
+    filterOrganizationOP.value = await DataStore.optionsTypeOc;
+    organization.value = await DataStore.typeOc;
+  }
+);
+
 /** Hook*/
 onMounted(async () => {
   filterOrganizationOP.value = await DataStore.optionsTypeOc;
@@ -267,14 +286,6 @@ onMounted(async () => {
     }
   }
 });
-
-watch(
-  () => DataStore.typeOc,
-  async () => {
-    filterOrganizationOP.value = await DataStore.optionsTypeOc;
-    organization.value = await DataStore.typeOc;
-  }
-);
 </script>
 
 <template>
@@ -314,6 +325,7 @@ watch(
           outlined
           debounce="300"
           placeholder="ค้นหา"
+          @keydown.enter="onSearch"
         >
           <template v-slot:append>
             <q-icon name="search" />
@@ -434,7 +446,6 @@ watch(
           ref="table"
           :columns="columns"
           :rows="DataStore.rows"
-          :filter="filterKeyword"
           row-key="name"
           flat
           bordered