อัตรากำลังลูกจ้างประจำ ฯ

src/modules/02_organization/components/DialogSuccession.vue

@@ -127,7 +127,10 @@ const selectedPos = ref<PosMaster[]>([]);
 async function fetchTable() {
   selectedPos.value = [];
   await http
-    .post(config.API.orgPosMasterList, reqMaster)
+    .post(config.API.orgPosMasterList, {
+      ...reqMaster,
+      keyword: reqMaster.keyword.trim(),
+    })
     .then((res) => {
       totalRow.value = Math.ceil(res.data.result.total / reqMaster.pageSize);
       const data = res.data.result.data;
@@ -238,7 +241,7 @@ watch([() => reqMaster.page, () => reqMaster.pageSize], async () => {
         :tittle="'เลือกตำแหน่งที่ต้องการสืบทอดจากโครงสร้างปัจจุบัน'"
         :close="
           () => {
-            modal = false;
+            (modal = false), (filterTree = '');
           }
         "
       />
@@ -265,12 +268,7 @@ watch([() => reqMaster.page, () => reqMaster.pageSize], async () => {
               label="ค้นหา"
             >
               <template v-slot:append>
-                <q-icon
-                  v-if="filterTree !== ''"
-                  name="clear"
-                  class="cursor-pointer"
-                  @click="resetFilter"
-                />
+                <q-icon name="search" />
               </template>
             </q-input>
             <q-tree
@@ -281,7 +279,7 @@ watch([() => reqMaster.page, () => reqMaster.pageSize], async () => {
               :nodes="nodeTree"
               node-key="orgTreeId"
               label-key="labelName"
-              :filter="filterTree"
+              :filter="filterTree.trim()"
               no-results-label="ไม่พบข้อมูลที่ค้นหา"
               no-nodes-label="ไม่มีข้อมูล"
             >
@@ -327,7 +325,11 @@ watch([() => reqMaster.page, () => reqMaster.pageSize], async () => {
                   v-model="reqMaster.keyword"
                   label="ค้นหา"
                   @keyup.enter="filterKeyword"
-                />
+                >
+                  <template v-slot:append>
+                    <q-icon name="search" />
+                  </template>
+                </q-input>
               </div>
             </q-toolbar>
             <div class="col-12">