ข้อมูลการประเมิน

src/modules/01_masterdata/components/competency/01ListCompetency.vue

@@ -78,7 +78,9 @@ async function fetchList() {
   await http
     .get(
       config.API.kpiCapacity +
-        `/edit?page=${formQuery.page}&pageSize=${formQuery.pageSize}&keyword=${formQuery.keyword}&type=${store.competencyTypeVal}`
+        `/edit?page=${formQuery.page}&pageSize=${
+          formQuery.pageSize
+        }&keyword=${formQuery.keyword.trim()}&type=${store.competencyTypeVal}`
     )
     .then(async (res) => {
       total.value = res.data.result.total;
@@ -103,11 +105,12 @@ async function onViewDetailPage(id: string) {
 }
 
 function deleteData(id: string) {
-  dialogRemove($q, () => {
-    http
+  showLoader();
+  dialogRemove($q, async () => {
+    await http
       .delete(config.API.kpiCapacity + `/${id}`)
-      .then(() => {
-        fetchList();
+      .then(async () => {
+        await fetchList();
         success($q, "ลบข้อมูลสำเร็จ");
       })
       .catch((err) => {
@@ -190,13 +193,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>
       <q-select
@@ -210,7 +207,6 @@ onMounted(() => {
         map-options
         :options="columns"
         option-value="name"
-        
         style="min-width: 140px"
       />
     </div>