แก้ select /input

src/modules/15_development/views/EmployeeHistory.vue

@@ -195,6 +195,7 @@ function onEdit(id: string) {
 /** ดึงข้อมูล */
 async function getData() {
   showLoader();
+  formFilter.keyword = formFilter.keyword.trim()
   await http
     .post(config.API.developmentHistoryList("employee"), formFilter)
     .then((res) => {
@@ -362,16 +363,7 @@ onMounted(async () => {
             @keydown.enter.prevent="(formFilter.page = 1), getData()"
           >
             <template v-slot:append>
-              <q-icon v-if="formFilter.keyword == ''" name="search" />
-              <q-icon
-                v-if="formFilter.keyword !== ''"
-                name="clear"
-                class="cursor-pointer"
-                @click="
-                  formFilter.keyword = '';
-                  getData();
-                "
-              />
+              <q-icon name="search" />
             </template>
           </q-input>
         </div>

src/modules/15_development/views/History.vue

@@ -182,6 +182,7 @@ function fetchListOrg() {
  */
 async function getData() {
   showLoader();
+  formFilter.keyword = formFilter.keyword.trim();
   await http
     .post(config.API.developmentHistoryList("officer"), formFilter)
     .then((res) => {
@@ -384,16 +385,7 @@ onMounted(() => {
             @keydown.enter.prevent="(formFilter.page = 1), getData()"
           >
             <template v-slot:append>
-              <q-icon v-if="formFilter.keyword == ''" name="search" />
-              <q-icon
-                v-if="formFilter.keyword !== ''"
-                name="clear"
-                class="cursor-pointer"
-                @click="
-                  formFilter.keyword = '';
-                  getData();
-                "
-              />
+              <q-icon name="search" />
             </template>
           </q-input>
         </div>

src/modules/15_development/views/MainPage.vue

@@ -120,7 +120,7 @@ async function fetchListProject() {
   await http
     .get(
       config.API.developmentMain +
-        `?page=${formQuery.page}&pageSize=${formQuery.pageSize}&keyword=${formQuery.keyword}&year=${formQuery.year}&status=${formQuery.status}&node=${formQuery.node}&nodeId=${formQuery.nodeId}`
+        `?page=${formQuery.page}&pageSize=${formQuery.pageSize}&keyword=${formQuery.keyword.trim()}&year=${formQuery.year}&status=${formQuery.status}&node=${formQuery.node}&nodeId=${formQuery.nodeId}`
     )
     .then((res) => {
       const data = res.data.result.data;
@@ -301,13 +301,7 @@ onMounted(() => {
             <div class="text-subtitle2 text-bold">หน่วยงาน/ส่วนราชการ</div>
             <q-input dense outlined v-model="filterMain" label="ค้นหา">
               <template v-slot:append>
-                <q-icon
-                  v-if="filterMain !== ''"
-                  name="clear"
-                  class="cursor-pointer"
-                  @click="filterMain = ''"
-                />
-                <q-icon v-else name="search" color="grey-5" />
+                <q-icon name="search" />
               </template>
             </q-input>
 
@@ -318,7 +312,7 @@ onMounted(() => {
               node-key="orgTreeName"
               label-key="labelName"
               v-model:expanded="expanded"
-              :filter="filterMain"
+              :filter="filterMain.trim()"
               no-results-label="ไม่พบข้อมูลที่ค้นหา"
               no-nodes-label="ไม่มีข้อมูล"
               v-model:selected="formQuery.nodeId"
@@ -454,17 +448,7 @@ onMounted(() => {
             @keyup.enter="fetchListProjectNew"
           >
             <template v-slot:append>
-              <q-icon v-if="formQuery.keyword == ''" name="search" />
-              <q-icon
-                v-if="formQuery.keyword !== ''"
-                name="clear"
-                class="cursor-pointer"
-                @click="
-                  (formQuery.keyword = ''),
-                    fetchListProject(),
-                    (formQuery.page = 1)
-                "
-              />
+              <q-icon name="search" />
             </template>
           </q-input>
 
@@ -593,13 +577,7 @@ onMounted(() => {
                 <div class="q-pa-md">
                   <q-input dense outlined v-model="filter" label="ค้นหา">
                     <template v-slot:append>
-                      <q-icon
-                        v-if="filter !== ''"
-                        name="clear"
-                        class="cursor-pointer"
-                        @click="filter = ''"
-                      />
-                      <q-icon v-else name="search" color="grey-5" />
+                      <q-icon name="search" />
                     </template>
                   </q-input>
                   <q-tree

src/modules/15_development/views/Scholarship.vue

@@ -138,7 +138,7 @@ function fetchList() {
   http
     .get(
       config.API.devScholarship +
-        `?page=${formQuery.page}&pageSize=${formQuery.pageSize}&keyword=${formQuery.keyword}&year=${formQuery.year}&scholarshipType=${formQuery.type}`
+        `?page=${formQuery.page}&pageSize=${formQuery.pageSize}&keyword=${formQuery.keyword.trim()}&year=${formQuery.year}&scholarshipType=${formQuery.type}`
     )
     .then((res) => {
       const data = res.data.result.data;
@@ -305,13 +305,7 @@ onMounted(() => {
           @keyup.enter="fetchNewList()"
         >
           <template v-slot:append>
-            <q-icon v-if="formQuery.keyword == ''" name="search" />
-            <q-icon
-              v-if="formQuery.keyword !== ''"
-              name="clear"
-              class="cursor-pointer"
-              @click="(formQuery.keyword = ''), fetchNewList()"
-            />
+            <q-icon name="search" />
           </template>
         </q-input>