แก้ select /input

src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue

@@ -192,6 +192,8 @@ watch(
                 option-value="code"
                 emit-value
                 map-options
+                hide-selected
+                fill-input
                 use-input
                 style="width: 350px; max-width: auto"
                 @update:model-value="selected = []"
@@ -223,13 +225,7 @@ watch(
                 style="width: 850px; max-width: auto"
               >
                 <template v-slot:append>
-                  <q-icon v-if="filterKeyword2 == ''" name="search" />
-                  <q-icon
-                    v-if="filterKeyword2 !== ''"
-                    name="clear"
-                    class="cursor-pointer"
-                    @click="Reset"
-                  />
+                  <q-icon name="search" />
                 </template>
               </q-input>
               <q-select
@@ -243,7 +239,6 @@ watch(
                 map-options
                 :options="props.columns"
                 option-value="name"
-                
                 style="min-width: 140px"
                 class="gt-xs q-ml-sm"
               />
@@ -254,7 +249,7 @@ watch(
         <d-table
           :columns="props.columns"
           :rows="rows"
-          :filter="filterKeyword2"
+          :filter="filterKeyword2?.trim()"
           row-key="id"
           :visible-columns="props.visibleColumns"
           selection="multiple"

src/modules/11_discipline/components/4_Result/EditPage.vue

@@ -15,7 +15,7 @@ import type {
   ArrayPerson,
   ArrayFileList,
 } from "@/modules/11_discipline/interface/request/complaint";
-import type { FormData as FormInvestigateFact } from "@/modules/11_discipline/interface/request/InvestigateFact";
+import type { FormData as FormInvestigateFact } from "@/modules/11_discipline/interface/request/investigateFact";
 
 import DialogSendToCommand from "@/modules/11_discipline/components/4_Result/DialogSendToCommand.vue";
 import FormComplaints from "@/modules/11_discipline/components/1_Complaint/Form.vue"; //เรื่องร้องเรียน

src/modules/11_discipline/components/4_Result/MainPage.vue

@@ -36,7 +36,7 @@ async function fetchListResult() {
   await http
     .get(
       config.API.listResult() +
-        `?page=${pagination.value.page}&pageSize=${pagination.value.rowsPerPage}&keyword=${filter.value}&status=${status.value}`
+        `?page=${pagination.value.page}&pageSize=${pagination.value.rowsPerPage}&keyword=${filter.value.trim()}&status=${status.value}`
     )
     .then(async (res) => {
       const data = res.data.result.data;

src/modules/11_discipline/components/4_Result/Table.vue

@@ -80,7 +80,6 @@ function updatePaging(p: number, pS: number, key: string) {
   emit("update:queryString", p, pS, key);
 }
 
-
 function dataUpdate() {
   props.filterStatus(statusFilter.value);
 }
@@ -98,7 +97,6 @@ function filterFn() {
  * @param update function
  */
 function filterOptionFn(val: string, update: Function) {
-  statusFilter.value = "";
   update(() => {
     option.value = store.statusOptions.filter(
       (e: any) => e.name.search(val) !== -1
@@ -123,6 +121,8 @@ function updatePagination(newPagination: any) {
         outlined
         emit-value
         map-options
+        hide-selected
+        fill-input
         option-label="name"
         option-value="id"
         :options="option"
@@ -162,13 +162,7 @@ function updatePagination(newPagination: any) {
       class="col-xs-12 col-sm-3 col-md-2"
     >
       <template v-slot:append>
-        <q-icon v-if="inputfilter == ''" name="search" />
-        <q-icon
-          v-if="inputfilter !== ''"
-          name="clear"
-          class="cursor-pointer"
-          @click="resetFilter"
-        />
+        <q-icon name="search" />
       </template>
     </q-input>
     <q-select