diff --git a/src/modules/05_leave/components/FormLeave/Form.vue b/src/modules/05_leave/components/FormLeave/Form.vue
index 36cd08d..ac50dc6 100644
--- a/src/modules/05_leave/components/FormLeave/Form.vue
+++ b/src/modules/05_leave/components/FormLeave/Form.vue
@@ -87,11 +87,14 @@ function onSubmit() {
 
 function closeDialog() {
   modal.value = false;
+  search.value = "";
+  rows.value = [];
+  selected.value = [];
 }
 
-function getCommander() {
+async function getCommander() {
   showLoader();
-  http
+  await http
     .put(config.API.commanderPosexe("operate"), {
       isAct: isAct.value,
       keyword: search.value,
@@ -104,7 +107,6 @@ function getCommander() {
     })
     .catch((e) => {
       messageError($q, e);
-      hideLoader();
     })
     .finally(() => {
       hideLoader();
@@ -313,6 +315,7 @@ onMounted(() => {
                     hide-bottom-space
                     dense
                     label="คำค้น"
+                    @keydown.enter.prevent="getSearch()"
                   />
                 </div>
                 <q-checkbox
@@ -332,7 +335,7 @@ onMounted(() => {
                     label="ค้นหา"
                     class="full-width q-pa-sm"
                     outline
-                    @click.prevent="getCommander"
+                    @click.prevent="getSearch()"
                   >
                   </q-btn>
                 </div>
@@ -423,9 +426,14 @@ onMounted(() => {
         <q-separator />
 
         <q-card-actions align="right">
-          <q-btn label="บันทึก" color="secondary" type="submit"
-            ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
+          <q-btn
+            label="บันทึก"
+            color="secondary"
+            type="submit"
+            :disable="selected.length === 0"
           >
+            <q-tooltip>บันทึกข้อมูล</q-tooltip>
+          </q-btn>
         </q-card-actions>
       </q-form>
     </q-card>