diff --git a/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue b/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue
index fa61ca17f..e7697ce5b 100644
--- a/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue
+++ b/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue
@@ -35,7 +35,6 @@ const props = defineProps({
 const pageId = ref<string>(route.params.id as string);
 const keyword = ref<string>("");
 const isAct = ref<boolean>(false);
-const isAllDirector = ref<boolean>(false);
 
 const total = ref<number>(0);
 const totalList = ref<number>(1);
@@ -106,7 +105,6 @@ async function getData() {
       page: pagination.value.page,
       keyword: keyword.value,
       isAct: isAct.value,
-      isAllDirector: isAllDirector.value,
       keycloakId: props.keycloakUserId,
       type:
         props.profileType?.toLocaleLowerCase() === "officer"
@@ -198,7 +196,6 @@ function closeDialog() {
   modal.value = false;
   rows.value = [];
   selected.value = [];
-  isAllDirector.value = false;
 }
 
 watch(
@@ -234,45 +231,19 @@ watch(
         <q-card-section>
           <div class="row q-col-gutter-sm">
             <div class="col-12">
-              <div class="row items-center q-mb-sm">
+              <div class="row q-gutter-x-xs">
                 <q-input
                   dense
                   outlined
                   label="ค้นหา"
                   v-model="keyword"
-                  class="col-grow"
-                  style="max-width: 400px"
+                  style="width: 300px"
                   @keydown.enter.prevent="onSearchData()"
                 >
                   <template v-slot:append>
                     <q-icon name="search"></q-icon>
                   </template>
                 </q-input>
-
-                <q-space />
-
-                <q-btn
-                  color="primary"
-                  icon="search"
-                  label="ค้นหา"
-                  class="q-px-md"
-                  @click.prevent="onSearchData"
-                  style="width: 150px"
-                />
-              </div>
-
-              <div
-                class="row items-center q-gutter-x-md text-subtitle2 text-grey-8"
-              >
-                <q-checkbox
-                  keep-color
-                  v-model="isAllDirector"
-                  label="หัวหน้าทั้งหน่วยงาน"
-                  color="primary"
-                  @update:model-value="onSearchData"
-                >
-                  <q-tooltip>หัวหน้าทั้งหน่วยงาน</q-tooltip>
-                </q-checkbox>
                 <q-checkbox
                   keep-color
                   v-model="isAct"
@@ -280,11 +251,20 @@ watch(
                   color="primary"
                   @update:model-value="onSearchData"
                 >
-                  <q-tooltip>แสดงเฉพาะรักษาการแทน</q-tooltip>
+                  <q-tooltip>แสดงเฉพาะรักษาการแทน </q-tooltip>
                 </q-checkbox>
+                <q-space />
+                <q-btn
+                  color="primary"
+                  icon="search"
+                  label="ค้นหา"
+                  class="q-pa-sm"
+                  @click.prevent="onSearchData"
+                  style="width: 200px"
+                >
+                </q-btn>
               </div>
             </div>
-
             <div class="col-12 text-red">
               {{
                 props.type == "APPROVER"