From 18d1429adbf0a00771f697445ab04239cbfe8fda Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 11 Jun 2024 15:48:29 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B4=20=3D>=20=E0=B8=9B=E0=B8=A3=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=9A=20form?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DialogAddData.vue              |  7 +--
 .../Achievement/01_ProfessionalLicense.vue    | 45 +++++++++----------
 .../detail/Achievement/02_Train.vue           | 18 +++-----
 .../detail/Achievement/03_Insignia.vue        | 18 +++-----
 .../Achievement/04_DeclarationHonor.vue       | 14 ++----
 .../Achievement/05_ResultsPerformance.vue     | 20 +++------
 .../detail/Employee/01_DataEmployee.vue       | 34 ++++++--------
 .../detail/Employee/02_Employment.vue         | 10 +----
 .../detail/GovernmentInformation/01_Info.vue  | 16 ++-----
 .../GovernmentInformation/02_Discipline.vue   | 22 +++------
 .../detail/GovernmentInformation/03_Leave.vue | 13 +-----
 .../04_PerformSpecialWork.vue                 | 14 ++----
 .../detail/PersonalInformation/01_Profile.vue |  4 +-
 .../02_NameChangeHistory.vue                  |  7 ++-
 .../detail/PersonalInformation/03_Address.vue | 22 ++++-----
 .../PersonalInformation/04_FamilyNew.vue      | 25 ++++-------
 .../PersonalInformation/05_Education.vue      | 14 ++----
 .../PersonalInformation/06_SpecialSkill.vue   | 14 ++----
 .../detail/Salary/01_PositionSalary.vue       | 14 ++----
 .../detail/Salary/02_NotReceiveSalary.vue     | 22 +++------
 .../04_registryNew/views/detailView.vue       | 42 ++++-------------
 21 files changed, 117 insertions(+), 278 deletions(-)

diff --git a/src/modules/04_registryNew/components/DialogAddData.vue b/src/modules/04_registryNew/components/DialogAddData.vue
index 10a72a587..7b91ec9ca 100644
--- a/src/modules/04_registryNew/components/DialogAddData.vue
+++ b/src/modules/04_registryNew/components/DialogAddData.vue
@@ -182,9 +182,8 @@ watch(
   <q-dialog v-model="modal" persistent>
     <q-card style="min-width: 350px">
       <q-form @submit.prevent @validation-success="onSubmit()" greedy>
-        <q-card-section class="flex justify-between" style="padding: 0">
-          <DialogHeader tittle="เพิ่มข้อมูล" :close="closeDialog" />
-        </q-card-section>
+        <DialogHeader tittle="เพิ่มข้อมูล" :close="closeDialog" />
+
         <q-separator />
         <q-card-section class="q-pa-md q-col-gutter-md">
           <div class="row q-gutter-sm">
@@ -375,8 +374,6 @@ watch(
           <q-btn
             id="onSubmit"
             type="submit"
-            dense
-            unelevated
             label="บันทึก"
             color="public"
             class="q-px-md"
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 58ff6abb4..bf18daa96 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
@@ -238,7 +238,7 @@ function closeHistoryDialog() {
 async function fetchData(id: string) {
   showLoader();
   await http
-    .get(config.API.profileNewCertificateByProfileId(id,empType.value))
+    .get(config.API.profileNewCertificateByProfileId(id, empType.value))
     .then(async (res) => {
       rows.value = res.data.result;
     })
@@ -290,10 +290,13 @@ async function addData() {
 
 async function editData(idData: string) {
   await http
-    .patch(config.API.profileNewCertificateByCertificateId(idData,empType.value), {
-      ...profesLicenseData,
-      profileId: undefined,
-    })
+    .patch(
+      config.API.profileNewCertificateByCertificateId(idData, empType.value),
+      {
+        ...profesLicenseData,
+        profileId: undefined,
+      }
+    )
     .then(() => {
       fetchData(id.value);
       success($q, "บันทึกข้อมูลสำเร็จ");
@@ -325,7 +328,7 @@ async function editData(idData: string) {
 async function fetchHistoryData(id: string) {
   showLoader();
   await http
-    .get(config.API.profileNewCertificateHisByCertificateId(id,empType.value))
+    .get(config.API.profileNewCertificateHisByCertificateId(id, empType.value))
     .then(async (res) => {
       historyRows.value = res.data.result;
     })
@@ -551,11 +554,11 @@ onMounted(async () => {
           "
           :close="closeDialog"
         />
-        <q-separator color="grey-4" />
+        <q-separator />
 
-        <q-card-section style="max-height: 55vh" class="scroll">
-          <div class="row q-gutter-sm q-pb-sm">
-            <div class="col">
+        <q-card-section>
+          <div class="row q-col-gutter-sm q-pb-sm">
+            <div class="col-xs-12 col-md-6">
               <q-input
                 outlined
                 v-model="profesLicenseData.certificateType"
@@ -567,7 +570,7 @@ onMounted(async () => {
                 hide-bottom-space
               />
             </div>
-            <div class="col">
+            <div class="col-xs-12 col-md-6">
               <q-input
                 outlined
                 v-model="profesLicenseData.issuer"
@@ -582,8 +585,8 @@ onMounted(async () => {
               />
             </div>
           </div>
-          <div class="row q-gutter-sm q-pb-sm">
-            <div class="col">
+          <div class="row q-col-gutter-sm q-pb-sm">
+            <div class="col-xs-12 col-md-6">
               <q-input
                 outlined
                 v-model="profesLicenseData.certificateNo"
@@ -595,7 +598,7 @@ onMounted(async () => {
                 hide-bottom-space
               />
             </div>
-            <div class="col">
+            <div class="col-xs-12 col-md-6">
               <datepicker
                 menu-class-name="modalfix"
                 v-model="profesLicenseData.issueDate"
@@ -684,17 +687,9 @@ onMounted(async () => {
             </div>
           </div>
         </q-card-section>
-        <q-separator color="grey-4" />
+        <q-separator />
         <q-card-actions align="right">
-          <q-btn
-            dense
-            unelevated
-            label="บันทึก"
-            id="onSubmit"
-            type="submit"
-            color="public"
-            class="q-px-md"
-          >
+          <q-btn label="บันทึก" id="onSubmit" type="submit" color="public">
             <q-tooltip>บันทึกข้อมูล</q-tooltip>
           </q-btn>
         </q-card-actions>
@@ -708,7 +703,7 @@ onMounted(async () => {
         tittle="ประวัติแก้ไขใบอนุญาตประกอบวิชาชีพ"
         :close="closeHistoryDialog"
       />
-      <q-separator color="grey-4" />
+      <q-separator />
 
       <q-card-section style="max-height: 60vh" class="scroll">
         <div class="row q-gutter-sm q-mb-sm">
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 61a955d03..a119beb0e 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
@@ -700,8 +700,8 @@ onMounted(async () => {
           "
           :close="closeDialog"
         />
-        <q-separator color="grey-4" />
-        <q-card-section style="max-height: 55vh" class="scroll">
+        <q-separator />
+        <q-card-section>
           <div class="row q-mb-sm q-gutter-sm">
             <div class="col">
               <q-input
@@ -1063,17 +1063,9 @@ onMounted(async () => {
             </div>
           </div>
         </q-card-section>
-        <q-separator color="grey-4" />
+        <q-separator />
         <q-card-actions align="right">
-          <q-btn
-            dense
-            unelevated
-            label="บันทึก"
-            id="onSubmit"
-            type="submit"
-            color="public"
-            class="q-px-md"
-          >
+          <q-btn label="บันทึก" id="onSubmit" type="submit" color="public">
             <q-tooltip>บันทึกข้อมูล</q-tooltip>
           </q-btn>
         </q-card-actions>
@@ -1087,7 +1079,7 @@ onMounted(async () => {
         tittle="ประวัติแก้ไขการฝึกอบรม/ดูงาน"
         :close="closeHistoryDialog"
       />
-      <q-separator color="grey-4" />
+      <q-separator />
       <q-card-section style="max-height: 60vh" class="scroll">
         <div class="row q-gutter-sm q-mb-sm">
           <q-space />
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 5012e6989..6d52cc1dc 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue
@@ -811,8 +811,8 @@ onMounted(async () => {
           "
           :close="clickClose"
         />
-        <q-separator color="grey-4" />
-        <q-card-section style="max-height: 55vh" class="scroll">
+        <q-separator />
+        <q-card-section>
           <div class="row col-12 q-col-gutter-sm">
             <div class="col-xs-6 col-sm-6 col-md-6">
               <datepicker
@@ -1103,17 +1103,9 @@ onMounted(async () => {
             </div>
           </div>
         </q-card-section>
-        <q-separator color="grey-4" />
+        <q-separator />
         <q-card-actions align="right">
-          <q-btn
-            dense
-            unelevated
-            label="บันทึก"
-            id="onSubmit"
-            type="submit"
-            color="public"
-            class="q-px-md"
-          >
+          <q-btn label="บันทึก" id="onSubmit" type="submit" color="public">
             <q-tooltip>บันทึกข้อมูล</q-tooltip>
           </q-btn>
         </q-card-actions>
@@ -1127,7 +1119,7 @@ onMounted(async () => {
         tittle="ประวัติแก้ไขเครื่องราชอิสริยาภรณ์"
         :close="() => (modalHistory = false)"
       />
-      <q-separator color="grey-4" />
+      <q-separator  />
 
       <q-card-section style="max-height: 60vh" class="scroll">
         <div class="row q-gutter-sm q-mb-sm">
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 bd848d23a..6303e54d3 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue
@@ -541,8 +541,8 @@ onMounted(async () => {
           "
           :close="clickClose"
         />
-        <q-separator color="grey-4" />
-        <q-card-section style="max-height: 55vh" class="scroll">
+        <q-separator />
+        <q-card-section>
           <div class="row col-12 q-col-gutter-sm">
             <div class="row col-12 q-gutter-md q-py-sm text-grey-7">
               <q-radio
@@ -736,15 +736,7 @@ onMounted(async () => {
         </q-card-section>
         <q-separator color="grey-4" />
         <q-card-actions align="right">
-          <q-btn
-            dense
-            unelevated
-            label="บันทึก"
-            id="onSubmit"
-            type="submit"
-            color="public"
-            class="q-px-md"
-          >
+          <q-btn label="บันทึก" id="onSubmit" type="submit" color="public">
             <q-tooltip>บันทึกข้อมูล</q-tooltip>
           </q-btn>
         </q-card-actions>
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 54bf40e03..52120b315 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue
@@ -367,7 +367,9 @@ async function clickHistory(row: ResponseObject) {
 
   showLoader();
   try {
-    const res = await http.get(config.API.profileNewAssessmentsHisById(row.id,empType.value));
+    const res = await http.get(
+      config.API.profileNewAssessmentsHisById(row.id, empType.value)
+    );
 
     rowsHistory.value = res.data.result;
   } catch (e) {
@@ -611,8 +613,8 @@ onMounted(async () => {
           "
           :close="clickClose"
         />
-        <q-separator color="grey-4" />
-        <q-card-section style="max-height: 55vh" class="scroll">
+        <q-separator />
+        <q-card-section>
           <div class="row col-12 q-col-gutter-sm">
             <div class="col-12">
               <datepicker
@@ -785,15 +787,7 @@ onMounted(async () => {
 
         <q-separator />
         <q-card-actions align="right">
-          <q-btn
-            dense
-            unelevated
-            label="บันทึก"
-            id="onSubmit"
-            type="submit"
-            color="public"
-            class="q-px-md"
-          >
+          <q-btn label="บันทึก" id="onSubmit" type="submit" color="public">
             <q-tooltip>บันทึกข้อมูล</q-tooltip>
           </q-btn>
         </q-card-actions>
@@ -807,7 +801,7 @@ onMounted(async () => {
         tittle="ประวัติแก้ไขผลการประเมินการปฏิบัติราชการ"
         :close="() => (modalHistory = false)"
       />
-      <q-separator color="grey-4" />
+      <q-separator />
       <q-card-section style="max-height: 60vh" class="scroll">
         <div class="row q-gutter-sm q-mb-sm">
           <q-space />
diff --git a/src/modules/04_registryNew/components/detail/Employee/01_DataEmployee.vue b/src/modules/04_registryNew/components/detail/Employee/01_DataEmployee.vue
index 817b8fa96..9d9b4e307 100644
--- a/src/modules/04_registryNew/components/detail/Employee/01_DataEmployee.vue
+++ b/src/modules/04_registryNew/components/detail/Employee/01_DataEmployee.vue
@@ -440,8 +440,8 @@ onMounted(() => {
                 v-model="formData.employeeOc"
                 class="inputgreen"
                 label="สังกัด"
-                :rules="[(val: string) => !!val || `${'กรุณากรอกสังกัด'}`]"
               />
+              <!-- :rules="[(val: string) => !!val || `${'กรุณากรอกสังกัด'}`]" -->
             </div>
 
             <div class="col-xs-6 col-sm-3 col-md-3">
@@ -453,8 +453,8 @@ onMounted(() => {
                 v-model="formData.employeeTypeIndividual"
                 class="inputgreen"
                 label="ประเภทบุคคล"
-                :rules="[(val: string) => !!val || `${'กรุณากรอกประเภทบุคคล'}`]"
               />
+              <!-- :rules="[(val: string) => !!val || `${'กรุณากรอกประเภทบุคคล'}`]" -->
             </div>
             <div class="col-xs-6 col-sm-3 col-md-3">
               <q-input
@@ -465,10 +465,10 @@ onMounted(() => {
                 v-model="formData.employeeWage"
                 class="inputgreen"
                 label="ค่าจ้าง"
-                mask="#"
+                mask="###,###,###,###"
                 reverse-fill-mask
-                :rules="[(val: string) => !!val || `${'กรุณากรอกค่าจ้าง'}`]"
               />
+              <!-- :rules="[(val: string) => !!val || `${'กรุณากรอกค่าจ้าง'}`]" -->
             </div>
 
             <div class="col-xs-6 col-sm-3 col-md-3">
@@ -480,10 +480,10 @@ onMounted(() => {
                 v-model="formData.employeeMoneyIncrease"
                 class="inputgreen"
                 label="เงินเพิ่มการครองชึพชั่วคราว"
-                mask="#"
+                mask="###,###,###,###"
                 reverse-fill-mask
-                :rules="[(val: string) => !!val || `${'กรุณากรอกเงินเพิ่มการครองชึพชั่วคราว'}`]"
               />
+              <!-- :rules="[(val: string) => !!val || `${'กรุณากรอกเงินเพิ่มการครองชึพชั่วคราว'}`]" -->
             </div>
             <div class="col-xs-6 col-sm-3 col-md-3">
               <q-input
@@ -494,10 +494,10 @@ onMounted(() => {
                 v-model="formData.employeeMoneyAllowance"
                 class="inputgreen"
                 label="เงินช่วยเหลือการครองชึพชั่วคราว"
-                mask="#"
+                mask="###,###,###,###"
                 reverse-fill-mask
-                :rules="[(val: string) => !!val || `${'กรุณากรอกเงินช่วยเหลือการครองชึพชั่วคราว'}`]"
               />
+              <!-- :rules="[(val: string) => !!val || `${'กรุณากรอกเงินช่วยเหลือการครองชึพชั่วคราว'}`]" -->
             </div>
             <div class="col-xs-6 col-sm-3 col-md-3">
               <q-input
@@ -508,10 +508,10 @@ onMounted(() => {
                 v-model="formData.employeeMoneyEmployee"
                 class="inputgreen"
                 label="เงินสมทบประกันสังคม(ลูกจ้าง)"
-                mask="#"
+                mask="###,###,###,###"
                 reverse-fill-mask
-                :rules="[(val: string) => !!val || `${'กรุณากรอกเงินสมทบประกันสังคม(ลูกจ้าง)'}`]"
               />
+              <!-- :rules="[(val: string) => !!val || `${'กรุณากรอกเงินสมทบประกันสังคม(ลูกจ้าง)'}`]" -->
             </div>
             <div class="col-xs-6 col-sm-3 col-md-3">
               <q-input
@@ -522,25 +522,17 @@ onMounted(() => {
                 v-model="formData.employeeMoneyEmployer"
                 class="inputgreen"
                 label="เงินสมทบประกันสังคม(นายจ้าง)"
-                mask="#"
+                mask="###,###,###,###"
                 reverse-fill-mask
-                :rules="[(val: string) => !!val || `${'กรุณากรอกเงินสมทบประกันสังคม(นายจ้าง))'}`]"
               />
+              <!--  :rules="[(val: string) => !!val || `${'กรุณากรอกเงินสมทบประกันสังคม(นายจ้าง))'}`]" -->
             </div>
           </div>
         </q-card-section>
 
         <q-separator />
         <q-card-actions align="right">
-          <q-btn
-            dense
-            unelevated
-            label="บันทึก"
-            id="onSubmit"
-            type="submit"
-            color="public"
-            class="q-px-md"
-          >
+          <q-btn label="บันทึก" id="onSubmit" type="submit" color="public">
             <q-tooltip>บันทึกข้อมูล</q-tooltip>
           </q-btn>
         </q-card-actions>
diff --git a/src/modules/04_registryNew/components/detail/Employee/02_Employment.vue b/src/modules/04_registryNew/components/detail/Employee/02_Employment.vue
index e5c48239d..4f06326be 100644
--- a/src/modules/04_registryNew/components/detail/Employee/02_Employment.vue
+++ b/src/modules/04_registryNew/components/detail/Employee/02_Employment.vue
@@ -414,15 +414,7 @@ onMounted(() => {
         </q-card-section>
         <q-separator />
         <q-card-actions align="right">
-          <q-btn
-            dense
-            unelevated
-            label="บันทึก"
-            id="onSubmit"
-            type="submit"
-            color="public"
-            class="q-px-md"
-          >
+          <q-btn label="บันทึก" id="onSubmit" type="submit" color="public">
             <q-tooltip>บันทึกข้อมูล</q-tooltip>
           </q-btn>
         </q-card-actions>
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 e9cdc17a9..edb66ec3c 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/01_Info.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/01_Info.vue
@@ -660,9 +660,9 @@ onMounted(() => {
         <DialogHeader tittle="แก้ไขข้อมูลราชการ" :close="closeDialog" />
         <q-separator color="grey-4" />
 
-        <q-card-section style="max-height: 50vh" class="scroll">
+        <q-card-section>
           <div class="row q-col-gutter-sm">
-            <div class="col-6">
+            <div class="col-xs-12 col-md-6">
               <datepicker
                 v-model="containDate"
                 :locale="'th'"
@@ -704,7 +704,7 @@ onMounted(() => {
                 </template>
               </datepicker>
             </div>
-            <div class="col-6">
+            <div class="col-xs-12 col-md-6">
               <datepicker
                 v-model="workDate"
                 :locale="'th'"
@@ -764,15 +764,7 @@ onMounted(() => {
         </q-card-section>
         <q-separator />
         <q-card-actions align="right">
-          <q-btn
-            dense
-            unelevated
-            label="บันทึก"
-            id="onSubmit"
-            type="submit"
-            color="public"
-            class="q-px-md"
-          >
+          <q-btn label="บันทึก" id="onSubmit" type="submit" color="public">
             <q-tooltip>บันทึกข้อมูล</q-tooltip>
           </q-btn>
         </q-card-actions>
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 98f44178d..4a0c26983 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue
@@ -598,7 +598,7 @@ onMounted(async () => {
         <q-separator color="grey-4" />
         <q-card-section style="max-height: 50vh" class="scroll">
           <div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
-            <div class="col-xs-6 col-sm-6 col-md-6">
+            <div class="col-xs-12 col-sm-6 col-md-6">
               <datepicker
                 menu-class-name="modalfix"
                 v-model="disciplineData.date"
@@ -634,7 +634,7 @@ onMounted(async () => {
                 </template>
               </datepicker>
             </div>
-            <div class="col-xs-6 col-sm-6 col-md-6">
+            <div class="col-xs-12 col-sm-6 col-md-6">
               <q-input
                 ref="detailRef"
                 class="full-width inputgreen cursor-pointer"
@@ -647,7 +647,7 @@ onMounted(async () => {
                 :label="`${'รายละเอียด'}`"
               />
             </div>
-            <div class="col-xs-6 col-sm-6 col-md-6">
+            <div class="col-xs-12 col-sm-6 col-md-6">
               <selector
                 class="full-width inputgreen cursor-pointer"
                 outlined
@@ -669,7 +669,7 @@ onMounted(async () => {
                     ) "
               />
             </div>
-            <div class="col-xs-6 col-sm-6 col-md-6">
+            <div class="col-xs-12 col-sm-6 col-md-6">
               <q-input
                 class="full-width inputgreen cursor-pointer"
                 outlined
@@ -679,7 +679,7 @@ onMounted(async () => {
                 :label="`${'ล้างมลทิน'}`"
               />
             </div>
-            <div class="col-xs-6 col-sm-6 col-md-6">
+            <div class="col-xs-12 col-sm-6 col-md-6">
               <q-input
                 ref="refCommandNoRef"
                 class="full-width inputgreen cursor-pointer"
@@ -696,7 +696,7 @@ onMounted(async () => {
                 </template>
               </q-input>
             </div>
-            <div class="col-xs-6 col-sm-6 col-md-6">
+            <div class="col-xs-12 col-sm-6 col-md-6">
               <datepicker
                 menu-class-name="modalfix"
                 v-model="disciplineData.refCommandDate"
@@ -737,15 +737,7 @@ onMounted(async () => {
         </q-card-section>
         <q-separator />
         <q-card-actions align="right">
-          <q-btn
-            dense
-            unelevated
-            label="บันทึก"
-            id="onSubmit"
-            type="submit"
-            color="public"
-            class="q-px-md"
-          >
+          <q-btn label="บันทึก" id="onSubmit" type="submit" color="public">
             <q-tooltip>บันทึกข้อมูล</q-tooltip>
           </q-btn>
         </q-card-actions>
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 4c45c9d50..d860bfc4d 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue
@@ -1,4 +1,3 @@
-div
 <script setup lang="ts">
 import { ref, reactive, onMounted } from "vue";
 import { useRoute } from "vue-router";
@@ -683,7 +682,7 @@ onMounted(() => {
         />
         <q-separator color="grey-4" />
 
-        <q-card-section style="max-height: 50vh" class="scroll">
+        <q-card-section>
           <div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-select
@@ -802,15 +801,7 @@ onMounted(() => {
         </q-card-section>
         <q-separator />
         <q-card-actions align="right">
-          <q-btn
-            dense
-            unelevated
-            label="บันทึก"
-            id="onSubmit"
-            type="submit"
-            color="public"
-            class="q-px-md"
-          >
+          <q-btn label="บันทึก" id="onSubmit" type="submit" color="public">
             <q-tooltip>บันทึกข้อมูล</q-tooltip>
           </q-btn>
         </q-card-actions>
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 258a35cf7..83d9f3b07 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
@@ -541,8 +541,8 @@ onMounted(async () => {
           "
           :close="closeDialog"
         />
-        <q-separator color="grey-4" />
-        <q-card-section style="max-height: 50vh" class="scroll">
+        <q-separator />
+        <q-card-section>
           <div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
             <div class="col-xs-6 col-sm-6 col-md-6">
               <datepicker
@@ -709,15 +709,7 @@ onMounted(async () => {
         </q-card-section>
         <q-separator />
         <q-card-actions align="right">
-          <q-btn
-            dense
-            unelevated
-            label="บันทึก"
-            id="onSubmit"
-            type="submit"
-            color="public"
-            class="q-px-md"
-          >
+          <q-btn label="บันทึก" id="onSubmit" type="submit" color="public">
             <q-tooltip>บันทึกข้อมูล</q-tooltip>
           </q-btn>
         </q-card-actions>
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 39c457bb2..07a1f6ce1 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/01_Profile.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/01_Profile.vue
@@ -505,7 +505,7 @@ onMounted(async () => {
         />
 
         <q-separator />
-        <q-card-section style="max-height: 50vh" class="scroll">
+        <q-card-section>
           <div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-input
@@ -782,8 +782,6 @@ onMounted(async () => {
 
         <q-card-actions align="right">
           <q-btn
-            dense
-            unelevated
             label="บันทึก"
             id="onSubmit"
             type="submit"
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 3b39eeaa8..47d23f350 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue
@@ -709,12 +709,13 @@ watch(
           :tittle="dialogStatus === 'edit' ? 'แก้ไขข้อมูล' : 'เพิ่มข้อมูล'"
           :close="closeDialog"
         />
-        <q-separator color="grey-4" />
+        <q-separator />
 
-        <q-card-section style="max-height: 50vh" class="scroll">
+        <q-card-section>
           <div class="row q-mb-sm">
             <div class="col-5">
               <q-select
+                class="inputgreen"
                 outlined
                 v-model="changeNameData.status"
                 :options="statusOption"
@@ -923,9 +924,7 @@ watch(
           <q-btn
             id="onSubmit"
             type="submit"
-            dense
             :disable="submitDisable"
-            unelevated
             label="บันทึก"
             color="public"
             class="q-px-md"
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 11237ef9d..bf1868667 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/03_Address.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/03_Address.vue
@@ -254,7 +254,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
 async function getData() {
   showLoader();
   await http
-    .get(config.API.profileNewAddressByProfileId(profileId.value,empType.value))
+    .get(
+      config.API.profileNewAddressByProfileId(profileId.value, empType.value)
+    )
     .then((res) => {
       Object.assign(addressData, res.data.result);
 
@@ -369,7 +371,7 @@ async function fetchAll() {
 async function editData() {
   showLoader();
   await http
-    .patch(config.API.profileNewAddressById(id.value,empType.value), {
+    .patch(config.API.profileNewAddressById(id.value, empType.value), {
       ...formData,
       id: undefined,
     })
@@ -423,7 +425,7 @@ async function onClickOpenDialog() {
 async function clickHistory() {
   modalHistory.value = true;
   await http
-    .get(config.API.profileNewAddressHisById(id.value,empType.value))
+    .get(config.API.profileNewAddressHisById(id.value, empType.value))
     .then((res) => {
       rowsHistory.value = res.data.result;
     })
@@ -580,8 +582,8 @@ onMounted(async () => {
     <q-card>
       <q-form greedy @submit.prevent @validation-success="onSubmit">
         <DialogHeader tittle="แก้ไขข้อมูลที่อยู่" :close="clickClose" />
-        <q-separator color="grey-4" />
-        <q-card-section style="max-height: 60vh" class="scroll">
+        <q-separator />
+        <q-card-section>
           <div class="col-12 q-pb-xs">
             <q-input
               dense
@@ -802,15 +804,7 @@ onMounted(async () => {
         </q-card-section>
         <q-separator />
         <q-card-actions align="right">
-          <q-btn
-            dense
-            unelevated
-            label="บันทึก"
-            id="onSubmit"
-            type="submit"
-            color="public"
-            class="q-px-md"
-          >
+          <q-btn label="บันทึก" id="onSubmit" type="submit" color="public">
             <q-tooltip>บันทึกข้อมูล</q-tooltip>
           </q-btn>
         </q-card-actions>
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/04_FamilyNew.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/04_FamilyNew.vue
index 3b4a01923..01cf590ad 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/04_FamilyNew.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/04_FamilyNew.vue
@@ -260,7 +260,6 @@ function fetchDataChildren() {
 function onSubmit(type: string) {
   dialogConfirm($q, async () => {
     showLoader();
-
     const formBody = {
       profileId:
         !isEdit.value && empType.value === "" ? profileId.value : undefined,
@@ -325,7 +324,7 @@ function onOpenDialogForm(
 
   if (type === "father") {
     titleForm.value = "บิดา";
-    console.log(fatherData.isLive);
+    console.log(fatherData);
 
     fromData.isLive =
       fatherData.isLive === null ? 1 : fatherData.isLive ? 1 : 0;
@@ -793,7 +792,7 @@ onMounted(() => {
           "
           :close="closeDialog"
         />
-        <q-separator color="grey-4" />
+        <q-separator />
         <q-card-section>
           <div class="q-col-gutter-sm">
             <div class="row col" v-if="typeForm === 'couple'">
@@ -832,8 +831,10 @@ onMounted(() => {
                   :rules="
                     typeForm !== 'couple'
                       ? [
+                          (val) => !!val || 'กรุณากรอกเลขบัตรประชาชน',
                           (val) =>
-                            val.length === 13 || 'กรุณากรอกเลขบัตรประชาชน',
+                            val.length === 13 ||
+                            'กรุณากรอกเลขบัตรประชาชนให้ครบ 13 หลัก',
                         ]
                       : []
                   "
@@ -951,17 +952,9 @@ onMounted(() => {
         </q-card-section>
         <q-separator />
         <q-card-actions align="right">
-          <div class="q-pa-sm">
-            <q-btn
-              unelevated
-              label="บันทึก"
-              id="onSubmit"
-              type="submit"
-              color="public"
-            >
-              <q-tooltip>บันทึกข้อมูล</q-tooltip>
-            </q-btn>
-          </div>
+          <q-btn label="บันทึก" id="onSubmit" type="submit" color="public">
+            <q-tooltip>บันทึกข้อมูล</q-tooltip>
+          </q-btn>
         </q-card-actions>
       </q-form>
     </q-card>
@@ -981,7 +974,7 @@ onMounted(() => {
         }`"
         :close="closeDialog"
       />
-      <q-separator color="grey-4" />
+      <q-separator />
       <q-card-section>
         <div class="row q-gutter-sm q-mb-sm">
           <q-space />
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 c8ece79b7..20e886e3a 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
@@ -801,7 +801,7 @@ onMounted(async () => {
       <q-tr :props="props" class="cursor-pointer">
         <q-td v-for="col in props.cols" :key="col.id">
           <div>
-            {{ col.value === ""|| col.value === null ? "-" : col.value }}
+            {{ col.value === "" || col.value === null ? "-" : col.value }}
           </div>
         </q-td>
         <q-td auto-width>
@@ -975,7 +975,7 @@ onMounted(async () => {
           :close="closeDialog"
         />
         <q-separator />
-        <q-card-section style="max-height: 60vh" class="scroll">
+        <q-card-section>
           <div class="row q-col-gutter-sm">
             <div class="col-6">
               <q-select
@@ -1386,15 +1386,7 @@ onMounted(async () => {
         <q-separator />
 
         <q-card-actions align="right">
-          <q-btn
-            id="onSubmit"
-            type="submit"
-            dense
-            unelevated
-            label="บันทึก"
-            color="public"
-            class="q-px-md"
-          >
+          <q-btn id="onSubmit" type="submit" label="บันทึก" color="public">
             <q-tooltip>บันทึกข้อมูล</q-tooltip>
           </q-btn>
         </q-card-actions>
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 577cc3273..2b5a6c600 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue
@@ -510,8 +510,8 @@ onMounted(async () => {
           "
           :close="closeDialog"
         />
-        <q-separator color="grey-4" />
-        <q-card-section style="max-height: 50vh" class="scroll">
+        <q-separator />
+        <q-card-section>
           <div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-input
@@ -563,15 +563,7 @@ onMounted(async () => {
         <q-separator />
 
         <q-card-actions align="right">
-          <q-btn
-            dense
-            unelevated
-            label="บันทึก"
-            id="onSubmit"
-            type="submit"
-            color="public"
-            class="q-px-md"
-          >
+          <q-btn label="บันทึก" id="onSubmit" type="submit" color="public">
             <q-tooltip>บันทึกข้อมูล</q-tooltip>
           </q-btn>
         </q-card-actions>
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 2ec844c0b..8316e30a7 100644
--- a/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue
@@ -10,7 +10,7 @@ import type {
   DataOption2,
   DataOption,
 } from "@/modules/04_registryNew/interface/index/Main";
-import type { ObjectSalaryRef } from "@/modules/04_registryNew/interface/index/salary";
+
 import type { FormSalaryNew } from "@/modules/04_registryNew/interface/request/Salary";
 
 import DialogHeader from "@/components/DialogHeader.vue";
@@ -669,7 +669,7 @@ onMounted(() => {
         />
         <q-separator color="grey-4" />
 
-        <q-card-section style="max-height: 55vh" class="scroll">
+        <q-card-section style="max-height: 100%" class="scroll">
           <div class="row col-12 q-col-gutter-sm">
             <div class="col-xs-6 col-sm-6 col-md-6">
               <datepicker
@@ -984,15 +984,7 @@ onMounted(() => {
         </q-card-section>
         <q-separator />
         <q-card-actions align="right">
-          <q-btn
-            dense
-            unelevated
-            label="บันทึก"
-            id="onSubmit"
-            type="submit"
-            color="public"
-            class="q-px-md"
-          >
+          <q-btn label="บันทึก" id="onSubmit" type="submit" color="public">
             <q-tooltip>บันทึกข้อมูล</q-tooltip>
           </q-btn>
         </q-card-actions>
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 17f9cfb96..2765dd722 100644
--- a/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue
+++ b/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue
@@ -436,11 +436,11 @@ onMounted(() => {
           "
           :close="onClickCloseDialog"
         />
-        <q-separator color="grey-4" />
+        <q-separator />
 
-        <q-card-section style="max-height: 55vh" class="scroll">
+        <q-card-section>
           <div class="row col-12 q-col-gutter-sm">
-            <div class="col-xs-6 col-sm-6 col-md-6">
+            <div class="col-xs-12 col-sm-6 col-md-6">
               <datepicker
                 menu-class-name="modalfix"
                 v-model="formData.date"
@@ -477,7 +477,7 @@ onMounted(() => {
                 </template>
               </datepicker>
             </div>
-            <div class="col-6">
+            <div class="col-xs-12 col-sm-6 col-md-6">
               <q-input
                 ref="referenceRef"
                 outlined
@@ -507,7 +507,7 @@ onMounted(() => {
                 :label="`${'รายละเอียด'}`"
               />
             </div>
-            <div class="col-xs-6 col-sm-6 col-md-6">
+            <div class="col-xs-12 col-sm-6 col-md-6">
               <q-input
                 outlined
                 dense
@@ -523,7 +523,7 @@ onMounted(() => {
                 </template>
               </q-input>
             </div>
-            <div class="col-xs-6 col-sm-6 col-md-6">
+            <div class="col-xs-12 col-sm-6 col-md-6">
               <datepicker
                 menu-class-name="modalfix"
                 v-model="formData.refCommandDate"
@@ -567,15 +567,7 @@ onMounted(() => {
         <q-separator />
 
         <q-card-actions align="right">
-          <q-btn
-            dense
-            unelevated
-            label="บันทึก"
-            id="onSubmit"
-            type="submit"
-            color="public"
-            class="q-px-md"
-          >
+          <q-btn label="บันทึก" id="onSubmit" type="submit" color="public">
             <q-tooltip>บันทึกข้อมูล</q-tooltip>
           </q-btn>
         </q-card-actions>
diff --git a/src/modules/04_registryNew/views/detailView.vue b/src/modules/04_registryNew/views/detailView.vue
index de4e24dcd..1461cecd1 100644
--- a/src/modules/04_registryNew/views/detailView.vue
+++ b/src/modules/04_registryNew/views/detailView.vue
@@ -7,10 +7,10 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useQuasar } from "quasar";
 import type { DataOption } from "@/modules/04_registryNew/interface/index/Main";
-import type { DataPerson } from "@/modules/04_registryNew/interface/response/Main";
+
 import avatar from "@/assets/avatar_user.jpg";
 import TabMain from "@/modules/04_registryNew/components/detail/TabMain.vue";
-import UploadFile from "@/modules/11_discipline/components/UploadFile.vue";
+
 import type { ResponseObject } from "@/modules/04_registryNew/interface/response/Profile";
 import DialogHeader from "@/components/DialogHeader.vue";
 /** ถึงเเก่กรรม */
@@ -672,7 +672,9 @@ onMounted(async () => {
                 v-if="formDetail && formDetail.firstName && formDetail.lastName"
               >
                 {{
-                  `${formDetail?.prefix}${formDetail?.firstName} ${formDetail?.lastName} ${leaveReason}`
+                  `${formDetail?.prefix ? formDetail?.prefix : ""}${
+                    formDetail?.firstName
+                  } ${formDetail?.lastName} ${leaveReason}`
                 }}
               </h2>
             </div>
@@ -850,20 +852,8 @@ onMounted(async () => {
   <!-- Dialog เลือก Image -->
   <q-dialog v-model="dialogImage" persistent>
     <q-card style="width: 100vw; max-width: 60vw">
-      <q-card-section class="q-py-sm row">
-        <div class="text-h6">เลือกรูปภาพ</div>
-        <q-space />
-        <q-btn
-          icon="close"
-          unelevated
-          round
-          dense
-          @click="closeImage"
-          style="color: #ff8080; background-color: #ffdede"
-        >
-          <q-tooltip>ปิดหน้านี้</q-tooltip>
-        </q-btn>
-      </q-card-section>
+      <DialogHeader :tittle="'เลือกรูปภาพ'" :close="closeImage" />
+
       <q-separator />
       <q-card-section class="col-12 row">
         <div
@@ -935,23 +925,7 @@ onMounted(async () => {
       </q-card-section>
       <q-separator />
       <q-card-actions align="right">
-        <!-- <q-btn
-          flat
-          round
-          color="red"
-          @click="() => {}"
-          icon="mdi-delete-outline"
-        >
-          <q-tooltip>ลบรูปภาพ</q-tooltip>
-        </q-btn> -->
-        <q-btn
-          icon="check"
-          dense
-          flat
-          round
-          @click="selectAvatarHistory"
-          color="positive"
-        >
+        <q-btn @click="selectAvatarHistory" color="public" label="เลือกรูปภาพ">
           <q-tooltip>เลือกรูปภาพ</q-tooltip>
         </q-btn>
       </q-card-actions>