diff --git a/src/modules/11_discipline/components/1_Complaint/Form.vue b/src/modules/11_discipline/components/1_Complaint/Form.vue
index fcf4c116a..98bd0af17 100644
--- a/src/modules/11_discipline/components/1_Complaint/Form.vue
+++ b/src/modules/11_discipline/components/1_Complaint/Form.vue
@@ -689,7 +689,6 @@ onMounted(async () => {
 
               <div class="col-xs-12 col-sm-3" id="dateReceived">
                 <datepicker
-                  menu-class-name="modalfix"
                   v-model="formData.dateReceived"
                   :locale="'th'"
                   autoApply
@@ -763,7 +762,6 @@ onMounted(async () => {
 
               <div class="col-xs-12 col-sm-3" id="dateConsideration">
                 <datepicker
-                  menu-class-name="modalfix"
                   v-model="formData.dateConsideration"
                   @update:model-value="changeFormData()"
                   :locale="'th'"
@@ -847,7 +845,6 @@ onMounted(async () => {
 
               <div class="col-xs-12 col-sm-3" id="dateNotification">
                 <datepicker
-                  menu-class-name="modalfix"
                   v-model="formData.dateNotification"
                   :locale="'th'"
                   autoApply
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
index 2457c2a5d..1fd503615 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
@@ -1128,7 +1128,6 @@ onMounted(async () => {
                         <div class="row q-col-gutter-sm">
                           <div class="col-3">
                             <datepicker
-                              menu-class-name="modalfix"
                               :readonly="
                                 checkRoutePermisson ||
                                 isReadonly ||
@@ -1210,7 +1209,6 @@ onMounted(async () => {
                                   ? ''
                                   : dateEndInputStyle
                               "
-                              menu-class-name="modalfix"
                               v-model="formData.investigationDateEnd"
                               :readonly="
                                 checkRoutePermisson ||
diff --git a/src/modules/11_discipline/components/4_Result/Form.vue b/src/modules/11_discipline/components/4_Result/Form.vue
index a9ac971b7..d8bfabf96 100644
--- a/src/modules/11_discipline/components/4_Result/Form.vue
+++ b/src/modules/11_discipline/components/4_Result/Form.vue
@@ -584,7 +584,6 @@ watch(
               </div>
               <div class="col-2">
                 <datepicker
-                  menu-class-name="modalfix"
                   v-model="formData.year"
                   class="col-2"
                   :locale="'th'"
diff --git a/src/modules/11_discipline/components/5_Report/DetailPage.vue b/src/modules/11_discipline/components/5_Report/DetailPage.vue
index a39518ab2..05d743e51 100644
--- a/src/modules/11_discipline/components/5_Report/DetailPage.vue
+++ b/src/modules/11_discipline/components/5_Report/DetailPage.vue
@@ -72,7 +72,6 @@ onMounted(async () => {
         <q-toolbar style="padding: 0">
           <div class="q-pr-xs">
             <datepicker
-              menu-class-name="modalfix"
               v-model="date"
               :locale="'th'"
               autoApply
@@ -102,7 +101,6 @@ onMounted(async () => {
           </div>
           <div class="q-pl-xs">
             <datepicker
-              menu-class-name="modalfix"
               v-model="dateEnd"
               :locale="'th'"
               autoApply
diff --git a/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue b/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue
index 553145096..2f103afcc 100644
--- a/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue
+++ b/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue
@@ -429,7 +429,6 @@ onMounted(async () => {
           <div class="col-xs-3 col-sm-3 row">
             <div class="col-12">
               <datepicker
-                menu-class-name="modalfix"
                 :readonly="!edit"
                 v-model="data.startDateSuspend"
                 :locale="'th'"
@@ -478,7 +477,6 @@ onMounted(async () => {
           <div class="col-xs-3 col-sm-3 row">
             <div class="col-12">
               <datepicker
-                menu-class-name="modalfix"
                 :readonly="!edit || data.startDateSuspend === null"
                 v-model="data.endDateSuspend"
                 :locale="'th'"
diff --git a/src/modules/11_discipline/components/8_AppealComplain/Form.vue b/src/modules/11_discipline/components/8_AppealComplain/Form.vue
index bdd5371f7..fc8570eb3 100644
--- a/src/modules/11_discipline/components/8_AppealComplain/Form.vue
+++ b/src/modules/11_discipline/components/8_AppealComplain/Form.vue
@@ -591,7 +591,6 @@ onMounted(() => {
                   <div class="col-3">
                     <datepicker
                       :readonly="checkRoutePermission"
-                      menu-class-name="modalfix"
                       v-model="formData.year"
                       class="col-2"
                       :locale="'th'"
diff --git a/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue b/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue
index c21b24d3d..946073216 100644
--- a/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue
+++ b/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue
@@ -371,7 +371,6 @@ onMounted(async () => {
         <div class="row col-12 q-col-gutter-sm">
           <div class="col-2">
             <datepicker
-              menu-class-name="modalfix"
               v-model="formData.year"
               class="col-2"
               :locale="'th'"