diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
index 037b92c97..184482da2 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
@@ -494,6 +494,7 @@ onMounted(() => {
           <div class="row q-col-gutter-sm">
             <div class="col-xs-12 col-md-6">
               <datepicker
+                menu-class-name="modalfix"
                 v-model="containDate"
                 :locale="'th'"
                 autoApply
@@ -536,6 +537,7 @@ onMounted(() => {
             </div>
             <div class="col-xs-12 col-md-6">
               <datepicker
+                menu-class-name="modalfix"
                 v-model="workDate"
                 :locale="'th'"
                 autoApply
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
index 29eb52ca2..e1b37812a 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
@@ -1059,6 +1059,7 @@ onMounted(async () => {
             <div class="col-xs-12 col-sm-6 col-md-4">
               <!-- :rules="[ (val: string) => !!val || `${'กรุณาเลือกวันที่คำสั่งมีผล'}`, ]" -->
               <datepicker
+                menu-class-name="modalfix"
                 v-model="formData.commandDateAffect"
                 :locale="'th'"
                 autoApply
@@ -1179,6 +1180,7 @@ onMounted(async () => {
             <div class="col-xs-6 col-sm-6 col-md-4">
               <!-- :rules="[ (val: string) => !!val || `${'กรุณาเลือก วันที่ลงนาม'}`,]" -->
               <datepicker
+                menu-class-name="modalfix"
                 v-model="formData.commandDateSign"
                 :locale="'th'"
                 autoApply
diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
index a952dd6c3..f0c2988de 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
@@ -1023,6 +1023,7 @@ onMounted(async () => {
             <div class="col-xs-12 col-sm-6 col-md-4">
               <!-- :rules="[ (val: string) => !!val || `${'กรุณาเลือกวันที่คำสั่งมีผล'}`, ]" -->
               <datepicker
+                menu-class-name="modalfix"
                 v-model="formData.commandDateAffect"
                 :locale="'th'"
                 autoApply
@@ -1143,6 +1144,7 @@ onMounted(async () => {
             <div class="col-xs-6 col-sm-6 col-md-4">
               <!-- :rules="[ (val: string) => !!val || `${'กรุณาเลือก วันที่ลงนาม'}`,]" -->
               <datepicker
+                menu-class-name="modalfix"
                 v-model="formData.commandDateSign"
                 :locale="'th'"
                 autoApply
diff --git a/src/modules/04_registryPerson/views/edit/components/FormPosition.vue b/src/modules/04_registryPerson/views/edit/components/FormPosition.vue
index 8e6df441c..7cefdc88b 100644
--- a/src/modules/04_registryPerson/views/edit/components/FormPosition.vue
+++ b/src/modules/04_registryPerson/views/edit/components/FormPosition.vue
@@ -142,6 +142,7 @@ function classInput(val: boolean) {
     <div class="col-xs-12 col-sm-6 col-md-4">
       <!-- :rules="[ (val: string) => !!val || `${'กรุณาเลือกวันที่คำสั่งมีผล'}`, ]" -->
       <datepicker
+        menu-class-name="modalfix"
         :readonly="isReadonly"
         v-model="formData.commandDateAffect"
         :locale="'th'"
@@ -273,6 +274,7 @@ function classInput(val: boolean) {
     <div class="col-xs-6 col-sm-6 col-md-4">
       <!-- :rules="[ (val: string) => !!val || `${'กรุณาเลือก วันที่ลงนาม'}`,]" -->
       <datepicker
+        menu-class-name="modalfix"
         v-model="formData.commandDateSign"
         :locale="'th'"
         autoApply
diff --git a/src/modules/04_registryPerson/views/edit/components/Table.vue b/src/modules/04_registryPerson/views/edit/components/Table.vue
index cd6a8237a..552f5546f 100644
--- a/src/modules/04_registryPerson/views/edit/components/Table.vue
+++ b/src/modules/04_registryPerson/views/edit/components/Table.vue
@@ -1063,13 +1063,11 @@ onMounted(async () => {
                     />
 
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="formData.commandYear"
                       :locale="'th'"
                       autoApply
                       year-picker
                       :enableTimePicker="false"
-                      teleport-center
                       @update:model-value="onUpdateData"
                     >
                       <template #year="{ year }">{{ year + 543 }}</template>
@@ -1291,7 +1289,6 @@ onMounted(async () => {
                     :enableTimePicker="false"
                     week-start="0"
                     autoApply
-                    teleport-center
                     @update:model-value="onUpdateData"
                   >
                     <template #year="{ year }">{{ year + 543 }}</template>