diff --git a/src/modules/09_scholarship/views/detail.vue b/src/modules/09_scholarship/views/detail.vue
index a3fa770..4e84434 100644
--- a/src/modules/09_scholarship/views/detail.vue
+++ b/src/modules/09_scholarship/views/detail.vue
@@ -689,7 +689,6 @@ onMounted(async () => {
             <div class="row q-col-gutter-md">
               <div class="col-12 col-md-3">
                 <datepicker
-                  menu-class-name="modalfix"
                   v-model="formBody.scholarshipYear"
                   :locale="'th'"
                   autoApply
@@ -822,7 +821,6 @@ onMounted(async () => {
               </div>
               <div class="col-12 col-md-3">
                 <datepicker
-                  menu-class-name="modalfix"
                   v-model="formBody.bookNoDate"
                   :locale="'th'"
                   autoApply
@@ -865,7 +863,6 @@ onMounted(async () => {
               </div>
               <div class="col-12 col-md-3">
                 <datepicker
-                  menu-class-name="modalfix"
                   v-model="formBody.bookApproveDate"
                   :locale="'th'"
                   autoApply
@@ -960,7 +957,6 @@ onMounted(async () => {
               </div>
               <div class="col-12 col-md-3">
                 <datepicker
-                  menu-class-name="modalfix"
                   v-model="formBody.contractDate"
                   :locale="'th'"
                   autoApply
@@ -1018,7 +1014,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-12 col-md-3">
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="formBody.reportBackNoDate"
                       :locale="'th'"
                       autoApply
@@ -1057,7 +1052,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-12 col-md-3">
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="formBody.reportBackDate"
                       :locale="'th'"
                       autoApply
@@ -1205,7 +1199,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-12 col-md-3">
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="formBody.startDate"
                       :locale="'th'"
                       autoApply
@@ -1250,7 +1243,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-12 col-md-3">
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="formBody.endDate"
                       :locale="'th'"
                       autoApply
@@ -1334,7 +1326,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-12 col-md-3">
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="formBody.studyStartDate"
                       :locale="'th'"
                       autoApply
@@ -1375,7 +1366,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-12 col-md-3">
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="formBody.studyEndDate"
                       :locale="'th'"
                       readonly
@@ -1441,7 +1431,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-12 col-md-3">
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="formBody.studyAbroadStartDate"
                       :locale="'th'"
                       autoApply
@@ -1484,7 +1473,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-12 col-md-3">
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="formBody.studyAbroadEndDate"
                       :locale="'th'"
                       autoApply
@@ -1588,7 +1576,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-12 col-md-3">
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="formBody.startDate"
                       :locale="'th'"
                       autoApply
@@ -1633,7 +1620,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-12 col-md-3">
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="formBody.endDate"
                       :locale="'th'"
                       readonly
@@ -1717,7 +1703,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-12 col-md-3">
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="formBody.studyStartDate"
                       :locale="'th'"
                       readonly
@@ -1758,7 +1743,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-12 col-md-3">
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="formBody.studyEndDate"
                       :locale="'th'"
                       autoApply
@@ -1856,7 +1840,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-12 col-md-3">
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="formBody.startDate"
                       :locale="'th'"
                       readonly
@@ -1901,7 +1884,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-12 col-md-3">
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="formBody.endDate"
                       :locale="'th'"
                       autoApply
@@ -1985,7 +1967,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-12 col-md-3">
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="formBody.studyStartDate"
                       :locale="'th'"
                       readonly
@@ -2026,7 +2007,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-12 col-md-3">
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="formBody.studyEndDate"
                       readonly
                       :locale="'th'"
@@ -2099,7 +2079,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-12 col-md-3">
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="formBody.studyAbroadStartDate"
                       :locale="'th'"
                       autoApply
@@ -2142,7 +2121,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-12 col-md-3">
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="formBody.studyAbroadEndDate"
                       :locale="'th'"
                       autoApply
@@ -2343,7 +2321,6 @@ onMounted(async () => {
 
                   <div class="col-12 col-md-3">
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="formBody.startDate"
                       :locale="'th'"
                       autoApply
@@ -2392,7 +2369,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-12 col-md-3">
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="formBody.endDate"
                       :locale="'th'"
                       autoApply
@@ -2460,7 +2436,10 @@ onMounted(async () => {
                     />
                   </div>
 
-                  <div v-if="formBody.studyTopic == 'ดูงาน'" class="col-12 col-md-3">
+                  <div
+                    v-if="formBody.studyTopic == 'ดูงาน'"
+                    class="col-12 col-md-3"
+                  >
                     <q-input
                       dense
                       readonly
@@ -2479,7 +2458,6 @@ onMounted(async () => {
 
                   <div class="col-12 col-md-3">
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="formBody.studyAbroadStartDate"
                       :locale="'th'"
                       autoApply
@@ -2526,7 +2504,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-12 col-md-3">
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="formBody.studyAbroadEndDate"
                       :locale="'th'"
                       autoApply
@@ -2636,7 +2613,6 @@ onMounted(async () => {
               </div>
               <div class="col-12 col-md-3">
                 <datepicker
-                  menu-class-name="modalfix"
                   v-model="formBody.startDate"
                   :locale="'th'"
                   autoApply
@@ -2682,7 +2658,6 @@ onMounted(async () => {
               </div>
               <div class="col-12 col-md-3">
                 <datepicker
-                  menu-class-name="modalfix"
                   v-model="formBody.endDate"
                   :locale="'th'"
                   readonly
@@ -2750,7 +2725,6 @@ onMounted(async () => {
               </div>
               <div class="col-12 col-md-3">
                 <datepicker
-                  menu-class-name="modalfix"
                   v-model="formBody.studyStartDate"
                   :locale="'th'"
                   readonly
@@ -2796,7 +2770,6 @@ onMounted(async () => {
               </div>
               <div class="col-12 col-md-3">
                 <datepicker
-                  menu-class-name="modalfix"
                   v-model="formBody.studyEndDate"
                   :locale="'th'"
                   autoApply
@@ -2880,7 +2853,6 @@ onMounted(async () => {
               </div>
               <div class="col-12 col-md-3">
                 <datepicker
-                  menu-class-name="modalfix"
                   v-model="formBody.studyAbroadStartDate"
                   :locale="'th'"
                   autoApply
@@ -2921,7 +2893,6 @@ onMounted(async () => {
               </div>
               <div class="col-12 col-md-3">
                 <datepicker
-                  menu-class-name="modalfix"
                   v-model="formBody.studyAbroadEndDate"
                   :locale="'th'"
                   autoApply
diff --git a/src/modules/09_scholarship/views/main.vue b/src/modules/09_scholarship/views/main.vue
index e7813d7..be093ef 100644
--- a/src/modules/09_scholarship/views/main.vue
+++ b/src/modules/09_scholarship/views/main.vue
@@ -181,7 +181,6 @@ onMounted(async () => {
           <div class="items-center col-12 row q-col-gutter-sm q-mb-sm">
             <datepicker
               class="col-xs-12 col-md-1"
-              menu-class-name="modalfix"
               v-model="year"
               :locale="'th'"
               autoApply