diff --git a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
index c61c10654..1499e91f5 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
@@ -539,7 +539,7 @@ onMounted(async () => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh"
+      style="height: 300px"
       class="bg-white"
     >
       <q-form @submit.prevent greedy @validation-success="onSubmit()">
@@ -715,7 +715,7 @@ onMounted(async () => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh; min-width: 80%"
+      style="height: 500px; min-width: 80%"
       class="bg-white"
     >
       <q-header>
diff --git a/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue b/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
index d94ae0328..cb05031f9 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
@@ -688,7 +688,7 @@ onMounted(async () => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh"
+      style="height: 450px"
       class="bg-white"
     >
       <q-form @submit.prevent greedy @validation-success="onSubmit()">
@@ -1104,7 +1104,7 @@ onMounted(async () => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh; min-width: 80%"
+      style="height: 500px; min-width: 80%"
       class="bg-white"
     >
       <q-header>
diff --git a/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue b/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue
index 232e064f8..ff4d09b09 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue
@@ -790,7 +790,7 @@ onMounted(async () => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh"
+      style="height: 500px"
       class="bg-white"
     >
       <q-form greedy @submit.prevent @validation-success="onSubmit">
@@ -1125,7 +1125,7 @@ onMounted(async () => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh; min-width: 80%"
+      style="height: 500px; min-width: 80%"
       class="bg-white"
     >
       <q-header>
diff --git a/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue b/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue
index 14e5ea2e5..1d2666fd9 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue
@@ -245,7 +245,7 @@ async function addEditData(editStatus: boolean = false) {
     profileId: editStatus ? undefined : profileId.value,
     isDate: declHonorForm.isDate === "true" ? true : false,
     issueDate:
-      declHonorForm.isDate === true
+      declHonorForm.isDate === "true"
         ? declHonorForm.issueDate
         : new Date(`${issueDateYear.value}-01-01`),
   };
@@ -520,7 +520,7 @@ onMounted(async () => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh"
+      style="height: 320px"
       class="bg-white"
     >
       <q-form greedy @submit.prevent @validation-success="onSubmit">
diff --git a/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue b/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue
index 1d31e2309..1231e38d9 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue
@@ -589,7 +589,7 @@ onMounted(async () => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh"
+      style="height: 350px"
       class="bg-white"
     >
       <q-form greedy @submit.prevent @validation-success="onSubmit">
@@ -805,7 +805,7 @@ onMounted(async () => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh; min-width: 80%"
+      style="height: 500px; min-width: 80%"
       class="bg-white"
     >
       <q-header>
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/01_Info.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/01_Info.vue
index 695e07dca..7d4c2685d 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/01_Info.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/01_Info.vue
@@ -636,7 +636,7 @@ onMounted(() => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh"
+      style="height: 300px"
       class="bg-white"
     >
       <form @submit.prevent="validateForm">
@@ -778,7 +778,7 @@ onMounted(() => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh; min-width: 80%"
+      style="height: 500px; min-width: 80%"
       class="bg-white"
     >
       <q-header>
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue
index cc9a3603f..874a7ba80 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue
@@ -575,7 +575,7 @@ onMounted(async () => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh"
+      style="height: 300px"
       class="bg-white"
     >
       <q-form @submit.prevent greedy @validation-success="onSubmit()">
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/02_DisciplineHistory.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/02_DisciplineHistory.vue
index fa760dacd..afb02e7f3 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/02_DisciplineHistory.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/02_DisciplineHistory.vue
@@ -187,7 +187,7 @@ watch(modal, (status) => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh; min-width: 80%"
+      style="height: 500px; min-width: 80%"
       class="bg-white"
     >
       <q-header>
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue
index ce17ca0af..e601c0072 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue
@@ -673,7 +673,7 @@ onMounted(() => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh"
+      style="height: 400px"
       class="bg-white"
     >
       <form @submit.prevent="validateForm">
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/03_LeaveHistory.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/03_LeaveHistory.vue
index 582fdbc03..e3a075eef 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/03_LeaveHistory.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/03_LeaveHistory.vue
@@ -217,7 +217,7 @@ watch(modal, (status) => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh; min-width: 80%"
+      style="height: 500px; min-width: 80%"
       class="bg-white"
     >
       <q-header>
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
index dc2371b1a..c705a7c7a 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
@@ -521,7 +521,7 @@ onMounted(async () => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh"
+      style="height: 350px"
       class="bg-white"
     >
       <q-form @submit.prevent greedy @validation-success="onSubmit()">
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue
index 5ba2bb390..19b332723 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue
@@ -191,7 +191,7 @@ watch(modal, (status) => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh; min-width: 80%"
+      style="height: 500px; min-width: 80%"
       class="bg-white"
     >
       <q-header>
diff --git a/src/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue b/src/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue
index d136bb166..41789d4a4 100644
--- a/src/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue
+++ b/src/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue
@@ -396,7 +396,7 @@ onMounted(() => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh"
+      style="height: 200px"
       class="bg-white"
     >
       <q-form greedy @submit.prevent @validation-success="validateForm">
diff --git a/src/modules/04_registryNew/components/detail/Other/01_OtherInformationHistory.vue b/src/modules/04_registryNew/components/detail/Other/01_OtherInformationHistory.vue
index 9cb947397..e424737fa 100644
--- a/src/modules/04_registryNew/components/detail/Other/01_OtherInformationHistory.vue
+++ b/src/modules/04_registryNew/components/detail/Other/01_OtherInformationHistory.vue
@@ -132,7 +132,7 @@ watch(modal, (status) => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh; min-width: 80%"
+      style="height: 500px; min-width: 80%"
       class="bg-white"
     >
       <q-header>
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/01_Profile.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/01_Profile.vue
index 0e5439d72..3a89b8994 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/01_Profile.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/01_Profile.vue
@@ -464,7 +464,7 @@ onMounted(async () => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh"
+      style="height: 500px"
       class="bg-white"
     >
       <q-form greedy @submit.prevent @validation-success="onSubmit">
@@ -776,7 +776,7 @@ onMounted(async () => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh; min-width: 80%"
+      style="height: 500px; min-width: 80%"
       class="bg-white"
     >
       <q-header>
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue
index 7b6e90a87..535b5518e 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue
@@ -686,7 +686,7 @@ watch(
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh"
+      style="height: 350px"
       class="bg-white"
     >
       <q-form @submit.prevent greedy @validation-success="onSubmit()">
@@ -944,7 +944,7 @@ watch(
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh; min-width: 80%"
+      style="height: 500px; min-width: 80%"
       class="bg-white"
     >
       <q-header>
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/03_Address.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/03_Address.vue
index 10200e328..210880872 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/03_Address.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/03_Address.vue
@@ -569,7 +569,7 @@ onMounted(async () => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh"
+      style="height: 600px"
       class="bg-white"
     >
       <q-form greedy @submit.prevent @validation-success="onSubmit">
@@ -826,7 +826,7 @@ onMounted(async () => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh; min-width: 80%"
+      style="height: 500px; min-width: 80%"
       class="bg-white"
     >
       <q-header>
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue
index c5e87d9a1..db6fc1b32 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue
@@ -515,7 +515,7 @@ onMounted(async () => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh; min-width: 80%"
+      style="height: 90vh; min-width: 80%"
       class="bg-white"
     >
       <q-form @submit.prevent greedy @validation-success="onSubmit()">
@@ -1120,7 +1120,7 @@ onMounted(async () => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh; min-width: 80%"
+      style="height: 90vh; min-width: 80%"
       class="bg-white"
     >
       <q-header>
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
index fed637cf7..07895317d 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
@@ -1424,7 +1424,7 @@ onMounted(async () => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh; min-width: 80%"
+      style="height: 500px; min-width: 80%"
       class="bg-white"
     >
       <q-header>
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue
index 03f2dcffe..ae4f395b1 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue
@@ -498,7 +498,7 @@ onMounted(async () => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh"
+      style="height: 300px"
       class="bg-white"
     >
       <q-form @submit.prevent greedy @validation-success="onSubmit()">
@@ -593,7 +593,7 @@ onMounted(async () => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh; min-width: 80%"
+      style="height: 500px; min-width: 80%"
       class="bg-white"
     >
       <q-header>
diff --git a/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue
index 9d4946df6..ed9fcdb43 100644
--- a/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue
@@ -527,7 +527,7 @@ onMounted(() => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh; min-width: 80%"
+      style="height: 90vh; min-width: 80%"
       class="bg-white"
     >
       <q-form greedy @submit.prevent @validation-success="onSubmit">
diff --git a/src/modules/04_registryNew/components/detail/Salary/01_PositionSalaryHistory.vue b/src/modules/04_registryNew/components/detail/Salary/01_PositionSalaryHistory.vue
index 55866d91c..ff4c5d781 100644
--- a/src/modules/04_registryNew/components/detail/Salary/01_PositionSalaryHistory.vue
+++ b/src/modules/04_registryNew/components/detail/Salary/01_PositionSalaryHistory.vue
@@ -251,7 +251,7 @@ watch(
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh; min-width: 80%"
+      style="height: 500px; min-width: 80%"
       class="bg-white"
     >
       <q-header>
diff --git a/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue b/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue
index bc0d3fbec..f9747afc4 100644
--- a/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue
+++ b/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue
@@ -419,7 +419,7 @@ onMounted(() => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh; min-width: 80%"
+      style="height: 300px; min-width: 80%"
       class="bg-white"
     >
       <q-form @submit.prevent greedy @validation-success="onSubmit">
diff --git a/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalaryHistory.vue b/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalaryHistory.vue
index b719ef1a8..641e54b1c 100644
--- a/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalaryHistory.vue
+++ b/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalaryHistory.vue
@@ -147,13 +147,13 @@ watch(modal, (status) => {
     <q-layout
       view="lHh lpr lFf"
       container
-      style="height: 80vh; min-width: 80%"
+      style="height: 500px; min-width: 80%"
       class="bg-white"
     >
       <q-header>
         <q-toolbar>
           <DialogHeader
-            :tittle="'ประวัติแก้ไขตำแหน่ง/เงินเดือน'"
+            :tittle="'ประวัติแก้ไขบันทึกวันที่ไม่ได้รับเงินเดือนฯ'"
             :close="closeDialog"
           />
         </q-toolbar>