diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
index c122c4107..c26b5d368 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
@@ -990,7 +990,11 @@ onMounted(async () => {
                               {{ props.row.organization }}
                             </div>
                             <div v-else-if="col.name === 'salary'">
-                              {{ props.row.salary?props.row.salary.toLocaleString():'0' }}
+                              {{
+                                props.row.salary
+                                  ? props.row.salary.toLocaleString()
+                                  : "0"
+                              }}
                             </div>
                             <div v-else-if="col.name === 'profileType'">
                               {{
@@ -1013,7 +1017,6 @@ onMounted(async () => {
               <div class="row col-12 q-col-gutter-x-md">
                 <datepicker
                   :readonly="isReadonly || checkRoutePermisson"
-                  menu-class-name="modalfix"
                   for="#dateAllegation"
                   v-model="formData.disciplinaryDateInvestigation"
                   class="col-xs-12 col-sm-3"
@@ -1074,7 +1077,6 @@ onMounted(async () => {
 
                 <datepicker
                   :readonly="isReadonly || checkRoutePermisson"
-                  menu-class-name="modalfix"
                   for="#dateAllegation"
                   v-model="formData.disciplinaryDateAllegation"
                   class="col-xs-12 col-sm-3"
@@ -1228,7 +1230,6 @@ onMounted(async () => {
 
                           <div v-if="!extendStatus" class="col-3">
                             <datepicker
-                              menu-class-name="modalfix"
                               :readonly="
                                 checkRoutePermisson ||
                                 isReadonly ||
@@ -1307,7 +1308,6 @@ onMounted(async () => {
                           <div class="col-3">
                             <datepicker
                               :class="isReadonly ? '' : dateEndInputStyle"
-                              menu-class-name="modalfix"
                               v-model="formData.disciplinaryDateEnd"
                               :readonly="
                                 checkRoutePermisson ||
@@ -1417,7 +1417,6 @@ onMounted(async () => {
 
               <datepicker
                 :readonly="isReadonly || checkRoutePermisson"
-                menu-class-name="modalfix"
                 for="#dateEvident"
                 v-model="formData.disciplinaryDateEvident"
                 :locale="'th'"
@@ -1479,7 +1478,6 @@ onMounted(async () => {
 
               <datepicker
                 :readonly="isReadonly || checkRoutePermisson"
-                menu-class-name="modalfix"
                 for="#dateResult"
                 v-model="formData.disciplinaryDateResult"
                 :locale="'th'"