ทดลองงาน

src/modules/05_placement/components/probation/FormAppoint/FormAppoint.vue

@@ -434,6 +434,8 @@ watch(
   () => modal.value,
   () => {
     if (modal.value) {
+      filterKeyword.value = "";
+
       optionsTypeMain.value = optionsType.value;
       const optionData = optionsType.value;
       const caregiverCount = rows.value.filter(
@@ -611,23 +613,24 @@ onMounted(async () => {
         <q-separator />
         <q-card-section>
           <div class="row q-col-gutter-sm">
+            <div class="col-2">
+              <q-select
+                v-model="member"
+                outlined
+                dense
+                label="บทบาท"
+                :options="optionsTypeMain"
+                option-value="id"
+                option-label="value"
+                map-options
+                emit-value
+                @update:model-value="selected = []"
+              >
+              </q-select>
+            </div>
             <div class="col-12">
               <div class="row">
-                <div class="col-2">
-                  <q-select
-                    v-model="member"
-                    outlined
-                    dense
-                    label="บทบาท"
-                    :options="optionsTypeMain"
-                    option-value="id"
-                    option-label="value"
-                    map-options
-                    emit-value
-                    @update:model-value="selected = []"
-                  >
-                  </q-select>
-                </div>
+                <!-- <div class="col-2"></div> -->
                 <q-checkbox
                   keep-color
                   v-model="isDirector"
@@ -656,16 +659,10 @@ onMounted(async () => {
                   outlined
                   debounce="300"
                   placeholder="ค้นหา"
-                  @keydown.enter.prevent="getPerson()"
+                  @keydown.enter.prevent="(pagination.page = 1), getPerson()"
                 >
                   <template v-slot:append>
-                    <q-icon v-if="filterKeyword == ''" name="search" />
-                    <q-icon
-                      v-if="filterKeyword !== ''"
-                      name="clear"
-                      class="cursor-pointer"
-                      @click="resetFilter()"
-                    />
+                    <q-icon name="search" />
                   </template>
                 </q-input>