diff --git a/src/modules/18_command/components/Step/1_Detail.vue b/src/modules/18_command/components/Step/1_Detail.vue
index db8f924c9..e1e51e74b 100644
--- a/src/modules/18_command/components/Step/1_Detail.vue
+++ b/src/modules/18_command/components/Step/1_Detail.vue
@@ -144,7 +144,6 @@ onMounted(async () => {
           </label>
           <div class="col-5">
             <datepicker
-              menu-class-name="modalfix"
               v-model="formData.commandYear"
               :locale="'th'"
               autoApply
@@ -189,7 +188,6 @@ onMounted(async () => {
         <div class="col-4">
           <datepicker
             clearable
-            menu-class-name="modalfix"
             v-model="formData.commandAffectDate"
             :locale="'th'"
             autoApply
@@ -236,7 +234,6 @@ onMounted(async () => {
         <div class="col-4">
           <datepicker
             clearable
-            menu-class-name="modalfix"
             v-model="formData.commandExcecuteDate"
             :locale="'th'"
             autoApply
diff --git a/src/modules/18_command/views/lists.vue b/src/modules/18_command/views/lists.vue
index ab642b701..fc5f64f2e 100644
--- a/src/modules/18_command/views/lists.vue
+++ b/src/modules/18_command/views/lists.vue
@@ -105,7 +105,6 @@ onMounted(async () => {
     <div class="row q-col-gutter-sm">
       <div class="col-12 row">
         <datepicker
-          menu-class-name="modalfix"
           v-model="queryParams.year"
           :locale="'th'"
           autoApply
@@ -193,7 +192,9 @@ onMounted(async () => {
               outlined
               v-model="queryParams.keyword"
               label="ค้นหา"
-              @keydown.enter.prevent="(queryParams.page = 1), fetchListCommand()"
+              @keydown.enter.prevent="
+                (queryParams.page = 1), fetchListCommand()
+              "
             >
               <template v-slot:append> <q-icon name="search" /> </template
             ></q-input>