From 6f5f1f90c9d33eb22a7f328e21a16810741d4047 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 30 Apr 2024 10:59:11 +0700
Subject: [PATCH] fix bug calendar

---
 src/components/information/Assessment.vue     |    1 -
 src/components/information/Certicate.vue      |    2 -
 src/components/information/Coin.vue           |    2 -
 src/components/information/Discipline.vue     |    2 -
 src/components/information/Education.vue      |    5 -
 src/components/information/Government.vue     |    2 -
 src/components/information/Information.vue    |    1 -
 src/components/information/Insignia.vue       |    4 -
 src/components/information/Leave.vue          |    1 -
 src/components/information/Other.vue          |    2 +-
 src/components/information/Record.vue         |    2 -
 src/components/information/Salary.vue         |    2 +-
 src/components/information/SalaryEmployee.vue |    2 +-
 .../information/SalaryEmployeeTemp.vue        |    2 +-
 src/components/information/TableProfile.vue   |    2 -
 src/components/information/Train.vue          |    8 +-
 src/components/information/Work.vue           |    6 +-
 .../01_metadata/components/Calendar.vue       |    2 +-
 .../components/calendar/Calendar.vue          |    2 +-
 .../03_recruiting/components/Career.vue       |    2 -
 .../03_recruiting/components/Education.vue    |    1 -
 .../03_recruiting/components/Information.vue  |    1 -
 .../views/01_compete/PeriodAdd.vue            | 2025 ++++++++---------
 .../views/02_qualify/DisablePeriodAdd.vue     |    2 +-
 .../views/02_qualify/PeriodAdd.vue            |    1 -
 src/modules/04_registry/components/Coin.vue   |    6 +-
 .../components/DialogFormLeave.vue            |    2 +-
 .../04_registry/components/Discipline.vue     |    4 +-
 .../04_registry/components/Education.vue      |   10 +-
 .../components/Information/Certicate.vue      |   49 +-
 .../components/Information/Government.vue     |    4 +-
 .../components/Information/Information.vue    |    2 +-
 .../04_registry/components/Insignia.vue       |    8 +-
 src/modules/04_registry/components/Leave.vue  |    2 +-
 src/modules/04_registry/components/Other.vue  |    2 +-
 .../04_registry/components/Profile.vue        |    4 +-
 src/modules/04_registry/components/Record.vue |    4 +-
 src/modules/04_registry/components/Salary.vue |    2 +-
 .../04_registry/components/SalaryEmployee.vue |    2 +-
 .../components/SalaryEmployeeTemp.vue         |    2 +-
 src/modules/04_registry/components/Train.vue  |   24 +-
 src/modules/04_registry/components/Work.vue   |    3 -
 .../components/salaryNew/SalaryEmployee.vue   |    2 +-
 .../salaryNew/SalaryEmployeeTemp.vue          |   11 +-
 .../Achievement/01_ProfessionalLicense.vue    |  371 ++-
 .../detail/Achievement/02_Train.vue           |   12 +-
 .../PersonalInformation/05_Education.vue      |  163 +-
 .../components/AppointEmployee/Detail.vue     |  200 +-
 .../components/AppointEmployee/Modal.vue      |  246 +-
 .../AppointMent/AppointmentModal.vue          |   25 +-
 .../components/AppointMent/Detail.vue         |    4 +-
 .../05_placement/components/Other/Detail.vue  |    4 +-
 .../components/Other/OtherModal.vue           |   12 +-
 .../components/PersonalDetail/Education.vue   |    5 -
 .../PersonalDetail/Information/Certicate.vue  |    4 +-
 .../Information/Information.vue               |    1 -
 .../components/PersonalList/CardPosition.vue  |    1 -
 .../components/PersonalList/OrgTree.vue       |    5 +-
 .../components/Receive/receiveDetail2.vue     |    2 +-
 .../components/Receive/receiveModal.vue       |    2 +-
 .../components/Relocation/RelocationModal.vue |    4 -
 .../components/Repatriate/RepatriatebyId.vue  |    4 +-
 .../components/Transfer/transferRegistry.vue  |    2 +-
 .../helpgovernment/governmentDetail.vue       |    4 +-
 .../Discharged/dischargedRegistry.vue         |    4 +-
 .../components/DismissOrder/outRegistry.vue   |    3 +-
 .../components/ExitInterview/exitMain.vue     |    1 -
 .../Expulsion/expulsionRegistry.vue           |    3 +-
 .../components/ListRetirement/TableList.vue   |    1 -
 .../components/resign/ResignByid.vue          |   10 +-
 .../components/1_Proposals/addProposals.vue   |    1 -
 .../components/3_result/DialogForm.vue        |    1 -
 .../components/3_result/Dialogbody.vue        |    7 +-
 .../components/5_Borrow/DialogForm.vue        |   18 +-
 .../components/AddEmployee/Main.vue           |    1 -
 .../components/EditEmployee/Assessment.vue    |   22 +-
 .../components/EditEmployee/Discipline.vue    |   21 +-
 .../components/EditEmployee/Education.vue     |   24 +-
 .../components/EditEmployee/Employment.vue    |  211 +-
 .../EditEmployee/Information/Certicate.vue    |   23 +-
 .../EditEmployee/Information/Government.vue   |    4 +-
 .../EditEmployee/Information/Information.vue  |    1 -
 .../components/EditEmployee/Leave.vue         |    2 +-
 .../components/EditEmployee/Other.vue         |    2 +-
 .../components/EditEmployee/Record.vue        |    2 -
 .../components/EditEmployee/Salary.vue        |   38 +-
 .../EditEmployee/SalaryEmployee.vue           |    1 -
 .../components/EditEmployee/Train.vue         |   22 +-
 .../components/EditEmployee/Work.vue          |   26 +-
 .../08_registryEmployee/views/EditDetail.vue  |    2 -
 .../components/1_Work/DialogReport.vue        |    2 -
 .../09_leave/components/1_Work/ToolBar.vue    |    1 -
 .../components/1_Work/ToolBarDate.vue         |    1 -
 .../components/2_Leave/ToolBarLeave.vue       |    1 -
 .../components/3_Report/LeaveReport.vue       |    3 -
 .../components/4_ChangeRound/DialogForm.vue   |    1 -
 .../4_specialTime/DialogApprove.vue           |    1 -
 .../components/4_specialTime/Table.vue        |    1 -
 .../10_order/components/PopupHistory.vue      |    4 +-
 .../components/5_Report/DetailPage.vue        |   27 +-
 .../components/7_ListSuspend/DetailPage.vue   |   56 +-
 .../components/8_AppealComplain/MainPage.vue  |    1 -
 .../13_salary/components/Command/step01.vue   |    6 +-
 .../13_salary/views/salaryEmployeeLists.vue   |    1 -
 src/modules/13_salary/views/salaryLists.vue   |    1 -
 src/modules/13_salary/views/salaryRound.vue   |    1 -
 .../indicatorByPlan/IndicatorByPlan.vue       |    1 -
 src/modules/14_KPI/views/indicatorByPlan.vue  |    9 +-
 src/modules/14_KPI/views/indicatorByRole.vue  |    1 -
 src/modules/14_KPI/views/list.vue             |    1 -
 src/modules/14_KPI/views/round.vue            |    1 -
 111 files changed, 2002 insertions(+), 1866 deletions(-)

diff --git a/src/components/information/Assessment.vue b/src/components/information/Assessment.vue
index 981e8cc44..44cb4f5f4 100644
--- a/src/components/information/Assessment.vue
+++ b/src/components/information/Assessment.vue
@@ -83,7 +83,6 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(date)"
                     :rules="[(val) => !!val || `${'กรุณาเลือกวันที่ได้รับ'}`]"
diff --git a/src/components/information/Certicate.vue b/src/components/information/Certicate.vue
index 1de0eea25..5151d5904 100644
--- a/src/components/information/Certicate.vue
+++ b/src/components/information/Certicate.vue
@@ -137,7 +137,6 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(issueDate)"
                     :rules="[
@@ -183,7 +182,6 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(expireDate)"
                     :rules="[(val) => !!val || `${'กรุณาเลือกวันที่หมดอายุ'}`]"
diff --git a/src/components/information/Coin.vue b/src/components/information/Coin.vue
index 8e676419e..0e3ea7709 100644
--- a/src/components/information/Coin.vue
+++ b/src/components/information/Coin.vue
@@ -88,7 +88,6 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(issueDate)"
                     :rules="[(val) => !!val || `${'กรุณาเลือกวันที่ได้รับ'}`]"
@@ -185,7 +184,6 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="
                       refCommandDate == null ? null : date2Thai(refCommandDate)
diff --git a/src/components/information/Discipline.vue b/src/components/information/Discipline.vue
index 493163918..186b85346 100644
--- a/src/components/information/Discipline.vue
+++ b/src/components/information/Discipline.vue
@@ -79,7 +79,6 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(date)"
                     :rules="[(val:string) => !!val || `${'กรุณาเลือกวัน เดือน ปี'}`]"
@@ -199,7 +198,6 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="
                       refCommandDate == null ? null : date2Thai(refCommandDate)
diff --git a/src/components/information/Education.vue b/src/components/information/Education.vue
index 6075c34d8..a666ae93e 100644
--- a/src/components/information/Education.vue
+++ b/src/components/information/Education.vue
@@ -158,7 +158,6 @@
                           :class="getClass(edit)"
                           :outlined="edit"
                           dense
-                          lazy-rules
                           :borderless="!edit"
                           :model-value="startDate + 543"
                           :rules="[
@@ -203,7 +202,6 @@
                           :class="getClass(edit)"
                           :outlined="edit"
                           dense
-                          lazy-rules
                           :borderless="!edit"
                           :model-value="date2Thai(startDate2)"
                           :rules="[
@@ -253,7 +251,6 @@
                           :class="getClass(edit)"
                           :outlined="edit"
                           dense
-                          lazy-rules
                           :borderless="!edit"
                           :model-value="endDate + 543"
                           :rules="[
@@ -297,7 +294,6 @@
                           :class="getClass(edit)"
                           :outlined="edit"
                           dense
-                          lazy-rules
                           :borderless="!edit"
                           :model-value="date2Thai(endDate2)"
                           :rules="[
@@ -347,7 +343,6 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(finishDate)"
                     :rules="[
diff --git a/src/components/information/Government.vue b/src/components/information/Government.vue
index 30e7a13be..cbeacc52c 100644
--- a/src/components/information/Government.vue
+++ b/src/components/information/Government.vue
@@ -145,7 +145,6 @@
                 hide-bottom-space
                 :outlined="edit"
                 dense
-                lazy-rules
                 :readonly="!edit"
                 :borderless="!edit"
                 :model-value="date2Thai(new Date(govermentData.containDate))"
@@ -198,7 +197,6 @@
                 hide-bottom-space
                 :outlined="edit"
                 dense
-                lazy-rules
                 :readonly="!edit"
                 :borderless="!edit"
                 :model-value="date2Thai(new Date(govermentData.workDate))"
diff --git a/src/components/information/Information.vue b/src/components/information/Information.vue
index d1e279ca3..2e466f97d 100644
--- a/src/components/information/Information.vue
+++ b/src/components/information/Information.vue
@@ -113,7 +113,6 @@
                 hide-bottom-space
                 :outlined="edit"
                 dense
-                lazy-rules
                 :readonly="!edit"
                 :borderless="!edit"
                 :model-value="
diff --git a/src/components/information/Insignia.vue b/src/components/information/Insignia.vue
index 8591e027f..9454a4cce 100644
--- a/src/components/information/Insignia.vue
+++ b/src/components/information/Insignia.vue
@@ -87,7 +87,6 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="year + 543"
                     :rules="[
@@ -134,7 +133,6 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(receiveDate)"
                     :rules="[(val:string) => !!val || `${'กรุณาเลือกวันที่ได้รับ'}`]"
@@ -306,7 +304,6 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(dateAnnounce)"
                     :rules="[
@@ -374,7 +371,6 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="
                       refCommandDate == null ? null : date2Thai(refCommandDate)
diff --git a/src/components/information/Leave.vue b/src/components/information/Leave.vue
index a92088bdc..1e3c635e5 100644
--- a/src/components/information/Leave.vue
+++ b/src/components/information/Leave.vue
@@ -129,7 +129,6 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="dateThaiRange(dateRange)"
                     :rules="[(val:string) => !!val || `${'กรุณาเลือกวัน เดือน ปีที่ลา'}`]"
diff --git a/src/components/information/Other.vue b/src/components/information/Other.vue
index 6a360745d..d7886ebb2 100644
--- a/src/components/information/Other.vue
+++ b/src/components/information/Other.vue
@@ -76,7 +76,7 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
+                    
                     :borderless="!edit"
                     :model-value="date2Thai(date)"
                     :rules="[(val) => !!val || `${'กรุณาเลือกวันที่'}`]"
diff --git a/src/components/information/Record.vue b/src/components/information/Record.vue
index e6a1f5115..62f9e5cdf 100644
--- a/src/components/information/Record.vue
+++ b/src/components/information/Record.vue
@@ -82,7 +82,6 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(date)"
                     :rules="[(val) => !!val || `${'กรุณาเลือกวัน เดือน ปี'}`]"
@@ -179,7 +178,6 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="
                       refCommandDate == null ? null : date2Thai(refCommandDate)
diff --git a/src/components/information/Salary.vue b/src/components/information/Salary.vue
index 619957561..49135a78b 100644
--- a/src/components/information/Salary.vue
+++ b/src/components/information/Salary.vue
@@ -143,7 +143,7 @@
                             :class="getClass(edit)"
                             :outlined="edit"
                             dense
-                            lazy-rules
+                            
                             :borderless="!edit"
                             :model-value="date2Thai(date)"
                             :rules="[
diff --git a/src/components/information/SalaryEmployee.vue b/src/components/information/SalaryEmployee.vue
index 8c1f0d1e1..43b881944 100644
--- a/src/components/information/SalaryEmployee.vue
+++ b/src/components/information/SalaryEmployee.vue
@@ -142,7 +142,7 @@
                             :class="getClass(edit)"
                             :outlined="edit"
                             dense
-                            lazy-rules
+                            
                             :borderless="!edit"
                             :model-value="date2Thai(date)"
                             :rules="[
diff --git a/src/components/information/SalaryEmployeeTemp.vue b/src/components/information/SalaryEmployeeTemp.vue
index 19597676b..0bd768e24 100644
--- a/src/components/information/SalaryEmployeeTemp.vue
+++ b/src/components/information/SalaryEmployeeTemp.vue
@@ -142,7 +142,7 @@
                             :class="getClass(edit)"
                             :outlined="edit"
                             dense
-                            lazy-rules
+                           
                             :borderless="!edit"
                             :model-value="date2Thai(date)"
                             :rules="[
diff --git a/src/components/information/TableProfile.vue b/src/components/information/TableProfile.vue
index df25354eb..800d98d26 100644
--- a/src/components/information/TableProfile.vue
+++ b/src/components/information/TableProfile.vue
@@ -191,7 +191,6 @@
                           hide-bottom-space
                           outlined
                           dense
-                          lazy-rules
                           borderless
                           :model-value="
                             retireYear == null ? null : retireYear + 543
@@ -332,7 +331,6 @@
                           hide-bottom-space
                           outlined
                           dense
-                          lazy-rules
                           borderless
                           :model-value="
                             reportYear == null ? null : reportYear + 543
diff --git a/src/components/information/Train.vue b/src/components/information/Train.vue
index d85fb0b5c..2ecb391aa 100644
--- a/src/components/information/Train.vue
+++ b/src/components/information/Train.vue
@@ -122,7 +122,7 @@
                     hide-bottom-space
                     :outlined="edit"
                     dense
-                    lazy-rules
+                   
                     :borderless="!edit"
                     :model-value="date2Thai(startDate)"
                     :rules="[
@@ -169,7 +169,7 @@
                     hide-bottom-space
                     :outlined="edit"
                     dense
-                    lazy-rules
+                    
                     :borderless="!edit"
                     :model-value="date2Thai(endDate)"
                     :rules="[
@@ -215,7 +215,7 @@
                     hide-bottom-space
                     :outlined="edit"
                     dense
-                    lazy-rules
+                    
                     :borderless="!edit"
                     :model-value="yearly + 543"
                     :rules="[(val) => !!val || `${'กรุณาเลือกปีงบประมาณ'}`]"
@@ -318,7 +318,7 @@
                     hide-bottom-space
                     :outlined="edit"
                     dense
-                    lazy-rules
+                    
                     :borderless="!edit"
                     :model-value="date2Thai(dateOrder)"
                     :label="`${'คำสั่งลงวันที่/หนังสืออนุมัติลงวันที่'}`"
diff --git a/src/components/information/Work.vue b/src/components/information/Work.vue
index a27025825..cfec85ef1 100644
--- a/src/components/information/Work.vue
+++ b/src/components/information/Work.vue
@@ -83,7 +83,7 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
+                    
                     :borderless="!edit"
                     :model-value="date2Thai(dateStart)"
                     :rules="[(val) => !!val || `${'กรุณาเลือกวันที่เริ่มต้น'}`]"
@@ -127,7 +127,7 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
+                    
                     :borderless="!edit"
                     :model-value="date2Thai(dateEnd)"
                     :rules="[(val) => !!val || `${'กรุณาเลือกวันที่สิ้นสุด'}`]"
@@ -224,7 +224,7 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
+                    
                     :borderless="!edit"
                     :model-value="
                       refCommandDate == null ? null : date2Thai(refCommandDate)
diff --git a/src/modules/01_metadata/components/Calendar.vue b/src/modules/01_metadata/components/Calendar.vue
index 43c1c831d..906ba88a7 100644
--- a/src/modules/01_metadata/components/Calendar.vue
+++ b/src/modules/01_metadata/components/Calendar.vue
@@ -75,7 +75,7 @@
                   :outlined="edit"
                   dense
                   label="วันที่"
-                  lazy-rules
+                  
                   :borderless="!edit"
                   :model-value="dateThaiRange(dateRange)"
                 >
diff --git a/src/modules/01_metadataNew/components/calendar/Calendar.vue b/src/modules/01_metadataNew/components/calendar/Calendar.vue
index 48dc9335d..5aa1c59bb 100644
--- a/src/modules/01_metadataNew/components/calendar/Calendar.vue
+++ b/src/modules/01_metadataNew/components/calendar/Calendar.vue
@@ -75,7 +75,7 @@
                   :outlined="edit"
                   dense
                   label="วันที่"
-                  lazy-rules
+                 
                   :borderless="!edit"
                   :model-value="dateThaiRange(dateRange)"
                 >
diff --git a/src/modules/03_recruiting/components/Career.vue b/src/modules/03_recruiting/components/Career.vue
index 81e5e4988..107d97efb 100644
--- a/src/modules/03_recruiting/components/Career.vue
+++ b/src/modules/03_recruiting/components/Career.vue
@@ -186,7 +186,6 @@
                     "
                     :outlined="status == 'checkRegister' || status == 'payment'"
                     dense
-                    lazy-rules
                     :borderless="
                       !status == 'checkRegister' || status == 'payment'
                     "
@@ -240,7 +239,6 @@
                     "
                     :outlined="status == 'checkRegister' || status == 'payment'"
                     dense
-                    lazy-rules
                     :borderless="
                       !status == 'checkRegister' || status == 'payment'
                     "
diff --git a/src/modules/03_recruiting/components/Education.vue b/src/modules/03_recruiting/components/Education.vue
index bffbc5790..96566474e 100644
--- a/src/modules/03_recruiting/components/Education.vue
+++ b/src/modules/03_recruiting/components/Education.vue
@@ -113,7 +113,6 @@
                 "
                 :outlined="status == 'checkRegister' || status == 'payment'"
                 dense
-                lazy-rules
                 :readonly="!(status == 'checkRegister' || status == 'payment')"
                 :borderless="
                   !(status == 'checkRegister' || status == 'payment')
diff --git a/src/modules/03_recruiting/components/Information.vue b/src/modules/03_recruiting/components/Information.vue
index ae38aa0a3..ab19830b7 100644
--- a/src/modules/03_recruiting/components/Information.vue
+++ b/src/modules/03_recruiting/components/Information.vue
@@ -151,7 +151,6 @@
               "
               :outlined="status == 'checkRegister' || status == 'payment'"
               dense
-              lazy-rules
               :readonly="!(status == 'checkRegister' || status == 'payment')"
               :borderless="!(status == 'checkRegister' || status == 'payment')"
               :model-value="
diff --git a/src/modules/03_recruiting/views/01_compete/PeriodAdd.vue b/src/modules/03_recruiting/views/01_compete/PeriodAdd.vue
index d1ddda8e6..8736fa91d 100644
--- a/src/modules/03_recruiting/views/01_compete/PeriodAdd.vue
+++ b/src/modules/03_recruiting/views/01_compete/PeriodAdd.vue
@@ -1,797 +1,663 @@
 <!-- page:จัดการรอบการสอบแข่งขัน สรรหา -->
 <template>
-	<div class="toptitle text-dark col-12 row items-center">
-		<q-btn
-			icon="mdi-arrow-left"
-			unelevated
-			round
-			dense
-			flat
-			color="primary"
-			class="q-mr-sm"
-			@click="clickBack"
-		/>
-		{{ edit ? "แก้ไขรอบสอบแข่งขัน" : "เพิ่มรอบสอบแข่งขัน" }}
-	</div>
-	<q-card flat bordered class="col-12">
-		<q-form ref="myForm">
-			<q-card-section class="q-pa-md">
-				<div class="col-xs-12 col-sm-8"></div>
-				<div class="col-12 row items-center q-col-gutter-x-sm">
-					<div class="col-xs-12 col-sm-8">
-						<q-input
-							outlined
-							v-model="name"
-							label="ชื่อรอบสอบแข่งขัน"
-							dense
-							lazy-rules
-							:rules="[
-								(val) =>
-									!!val || `${'กรุณากรอกชื่อรอบสอบแข่งขัน'}`,
-							]"
-						></q-input>
-					</div>
-					<div
-						class="col-xs-12 col-sm-4 col-md-1"
-						v-if="announcementExam"
-					>
-						<q-input
-							outlined
-							v-model="round"
-							type="number"
-							label="รอบการสอบ(ครั้ง)"
-							dense
-							lazy-rules
-							:rules="[
-								(val) =>
-									val > 0 ||
-									`${'กรุณากรอกรอบการสอบให้ถูกต้อง'}`,
-							]"
-						></q-input>
-					</div>
-					<div
-						class="col-xs-12 col-sm-4 col-md-1"
-						v-if="announcementExam"
-					>
-						<datepicker
-							menu-class-name="modalfix"
-							v-model="yearly"
-							:locale="'th'"
-							autoApply
-							year-picker
-							:enableTimePicker="false"
-							@update:modelValue="updateYear"
-						>
-							<template #year="{ year }">{{
-								year + 543
-							}}</template>
-							<template #year-overlay-value="{ value }">{{
-								parseInt(value + 543)
-							}}</template>
-							<template #trigger>
-								<q-input
-									dense
-									lazy-rules
-									outlined
-									:model-value="yearly + 543"
-									:rules="[
-										(val) =>
-											!!val ||
-											`${'กรุณาเลือกปีงบประมาณ'}`,
-									]"
-									:label="`${'ปีงบประมาณ'}`"
-								>
-									<template v-slot:prepend>
-										<q-icon
-											name="event"
-											class="cursor-pointer"
-											style="color: var(--q-primary)"
-										>
-										</q-icon>
-									</template>
-								</q-input>
-							</template>
-						</datepicker>
-					</div>
-					<div
-						class="col-xs-12 col-sm-4 col-md-2"
-						v-if="announcementExam"
-					>
-						<q-input
-							outlined
-							v-model="fee"
-							type="number"
-							label="ค่าธรรมเนียม"
-							dense
-							lazy-rules
-							input-class="text-right"
-							:rules="[
-								(val) =>
-									val >= 0 ||
-									`${'กรุณากรอกค่าธรรมเนียมให้ถูกต้อง'}`,
-							]"
-						></q-input>
-					</div>
-					<div
-						class="col-xs-12 col-sm-3 col-md-3"
-						v-if="announcementExam"
-					>
-						<datepicker
-							menu-class-name="modalfix"
-							v-model="dateExam"
-							:locale="'th'"
-							autoApply
-							borderless
-							:enableTimePicker="false"
-							week-start="0"
-						>
-							<template #year="{ year }">
-								{{ year + 543 }}
-							</template>
-							<template #year-overlay-value="{ value }">
-								{{ parseInt(value + 543) }}
-							</template>
-							<template #trigger>
-								<q-input
-									outlined
-									dense
-									class="full-width datepicker q-mb-md"
-									:model-value="
-										dateExam != null
-											? date2Thai(dateExam)
-											: null
-									"
-									:label="`${'วันที่สอบ'}`"
-									:rules="[
-										(val) =>
-											!!val || `${'กรุณาเลือกวันที่สอบ'}`,
-									]"
-								>
-									<template v-slot:prepend>
-										<q-icon
-											name="event"
-											class="cursor-pointer"
-											style="color: var(--q-primary)"
-										>
-										</q-icon>
-									</template>
-								</q-input>
-							</template>
-						</datepicker>
-					</div>
-					<div class="col-xs-12 col-sm-3 col-md-3">
-						<datepicker
-							menu-class-name="modalfix"
-							v-model="dateAnnouncement"
-							:locale="'th'"
-							autoApply
-							borderless
-							range
-							:enableTimePicker="false"
-							week-start="0"
-						>
-							<template #year="{ year }">
-								{{ year + 543 }}
-							</template>
-							<template #year-overlay-value="{ value }">
-								{{ parseInt(value + 543) }}
-							</template>
-							<template #trigger>
-								<q-input
-									outlined
-									dense
-									class="full-width datepicker q-mb-md"
-									:model-value="
-										dateAnnouncement != null
-											? dateThaiRange(dateAnnouncement)
-											: null
-									"
-									:label="`${'วันที่ประกาศ'}`"
-									:rules="[
-										(val) =>
-											!!val ||
-											`${'กรุณาเลือกวันที่ประกาศ'}`,
-									]"
-								>
-									<template v-slot:prepend>
-										<q-icon
-											name="event"
-											class="cursor-pointer"
-											style="color: var(--q-primary)"
-										>
-										</q-icon>
-									</template>
-								</q-input>
-							</template>
-						</datepicker>
-					</div>
-					<div
-						class="col-xs-12 col-sm-3 col-md-3"
-						v-if="announcementExam"
-					>
-						<datepicker
-							menu-class-name="modalfix"
-							v-model="dateRegister"
-							:locale="'th'"
-							autoApply
-							borderless
-							range
-							:enableTimePicker="false"
-							week-start="0"
-						>
-							<template #year="{ year }">
-								{{ year + 543 }}
-							</template>
-							<template #year-overlay-value="{ value }">
-								{{ parseInt(value + 543) }}
-							</template>
-							<template #trigger>
-								<q-input
-									outlined
-									dense
-									class="full-width datepicker q-mb-md"
-									:model-value="
-										dateRegister != null
-											? dateThaiRange(dateRegister)
-											: null
-									"
-									:label="`${'วันที่สมัคร'}`"
-									:rules="[
-										(val) =>
-											!!val ||
-											`${'กรุณาเลือกวันที่สมัคร'}`,
-									]"
-								>
-									<template v-slot:prepend>
-										<q-icon
-											name="event"
-											class="cursor-pointer"
-											style="color: var(--q-primary)"
-										>
-										</q-icon>
-									</template>
-								</q-input>
-							</template>
-						</datepicker>
-					</div>
-					<div
-						class="col-xs-12 col-sm-3 col-md-3"
-						v-if="announcementExam"
-					>
-						<datepicker
-							menu-class-name="modalfix"
-							v-model="datePayment"
-							:locale="'th'"
-							autoApply
-							borderless
-							range
-							:enableTimePicker="false"
-							week-start="0"
-						>
-							<template #year="{ year }">
-								{{ year + 543 }}
-							</template>
-							<template #year-overlay-value="{ value }">
-								{{ parseInt(value + 543) }}
-							</template>
-							<template #trigger>
-								<q-input
-									outlined
-									dense
-									class="full-width datepicker q-mb-md"
-									:model-value="
-										datePayment != null
-											? dateThaiRange(datePayment)
-											: null
-									"
-									:label="`${'วันที่ชำระเงิน'}`"
-									:rules="[
-										(val) =>
-											!!val ||
-											`${'กรุณาเลือกวันที่ชำระเงิน'}`,
-									]"
-								>
-									<template v-slot:prepend>
-										<q-icon
-											name="event"
-											class="cursor-pointer"
-											style="color: var(--q-primary)"
-										>
-										</q-icon>
-									</template>
-								</q-input>
-							</template>
-						</datepicker>
-					</div>
+  <div class="toptitle text-dark col-12 row items-center">
+    <q-btn
+      icon="mdi-arrow-left"
+      unelevated
+      round
+      dense
+      flat
+      color="primary"
+      class="q-mr-sm"
+      @click="clickBack"
+    />
+    {{ edit ? "แก้ไขรอบสอบแข่งขัน" : "เพิ่มรอบสอบแข่งขัน" }}
+  </div>
+  <q-card flat bordered class="col-12">
+    <q-form ref="myForm">
+      <q-card-section class="q-pa-md">
+        <div class="col-xs-12 col-sm-8"></div>
+        <div class="col-12 row items-center q-col-gutter-x-sm">
+          <div class="col-xs-12 col-sm-8">
+            <q-input
+              outlined
+              v-model="name"
+              label="ชื่อรอบสอบแข่งขัน"
+              dense
+              lazy-rules
+              :rules="[(val) => !!val || `${'กรุณากรอกชื่อรอบสอบแข่งขัน'}`]"
+            ></q-input>
+          </div>
+          <div class="col-xs-12 col-sm-4 col-md-1" v-if="announcementExam">
+            <q-input
+              outlined
+              v-model="round"
+              type="number"
+              label="รอบการสอบ(ครั้ง)"
+              dense
+              lazy-rules
+              :rules="[(val) => val > 0 || `${'กรุณากรอกรอบการสอบให้ถูกต้อง'}`]"
+            ></q-input>
+          </div>
+          <div class="col-xs-12 col-sm-4 col-md-1" v-if="announcementExam">
+            <datepicker
+              menu-class-name="modalfix"
+              v-model="yearly"
+              :locale="'th'"
+              autoApply
+              year-picker
+              :enableTimePicker="false"
+              @update:modelValue="updateYear"
+            >
+              <template #year="{ year }">{{ year + 543 }}</template>
+              <template #year-overlay-value="{ value }">{{
+                parseInt(value + 543)
+              }}</template>
+              <template #trigger>
+                <q-input
+                  dense
+                  outlined
+                  :model-value="yearly + 543"
+                  :rules="[(val) => !!val || `${'กรุณาเลือกปีงบประมาณ'}`]"
+                  :label="`${'ปีงบประมาณ'}`"
+                >
+                  <template v-slot:prepend>
+                    <q-icon
+                      name="event"
+                      class="cursor-pointer"
+                      style="color: var(--q-primary)"
+                    >
+                    </q-icon>
+                  </template>
+                </q-input>
+              </template>
+            </datepicker>
+          </div>
+          <div class="col-xs-12 col-sm-4 col-md-2" v-if="announcementExam">
+            <q-input
+              outlined
+              v-model="fee"
+              type="number"
+              label="ค่าธรรมเนียม"
+              dense
+              lazy-rules
+              input-class="text-right"
+              :rules="[
+                (val) => val >= 0 || `${'กรุณากรอกค่าธรรมเนียมให้ถูกต้อง'}`,
+              ]"
+            ></q-input>
+          </div>
+          <div class="col-xs-12 col-sm-3 col-md-3" v-if="announcementExam">
+            <datepicker
+              menu-class-name="modalfix"
+              v-model="dateExam"
+              :locale="'th'"
+              autoApply
+              borderless
+              :enableTimePicker="false"
+              week-start="0"
+            >
+              <template #year="{ year }">
+                {{ year + 543 }}
+              </template>
+              <template #year-overlay-value="{ value }">
+                {{ parseInt(value + 543) }}
+              </template>
+              <template #trigger>
+                <q-input
+                  outlined
+                  dense
+                  class="full-width datepicker q-mb-md"
+                  :model-value="dateExam != null ? date2Thai(dateExam) : null"
+                  :label="`${'วันที่สอบ'}`"
+                  :rules="[(val) => !!val || `${'กรุณาเลือกวันที่สอบ'}`]"
+                >
+                  <template v-slot:prepend>
+                    <q-icon
+                      name="event"
+                      class="cursor-pointer"
+                      style="color: var(--q-primary)"
+                    >
+                    </q-icon>
+                  </template>
+                </q-input>
+              </template>
+            </datepicker>
+          </div>
+          <div class="col-xs-12 col-sm-3 col-md-3">
+            <datepicker
+              menu-class-name="modalfix"
+              v-model="dateAnnouncement"
+              :locale="'th'"
+              autoApply
+              borderless
+              range
+              :enableTimePicker="false"
+              week-start="0"
+            >
+              <template #year="{ year }">
+                {{ year + 543 }}
+              </template>
+              <template #year-overlay-value="{ value }">
+                {{ parseInt(value + 543) }}
+              </template>
+              <template #trigger>
+                <q-input
+                  outlined
+                  dense
+                  class="full-width datepicker q-mb-md"
+                  :model-value="
+                    dateAnnouncement != null
+                      ? dateThaiRange(dateAnnouncement)
+                      : null
+                  "
+                  :label="`${'วันที่ประกาศ'}`"
+                  :rules="[(val) => !!val || `${'กรุณาเลือกวันที่ประกาศ'}`]"
+                >
+                  <template v-slot:prepend>
+                    <q-icon
+                      name="event"
+                      class="cursor-pointer"
+                      style="color: var(--q-primary)"
+                    >
+                    </q-icon>
+                  </template>
+                </q-input>
+              </template>
+            </datepicker>
+          </div>
+          <div class="col-xs-12 col-sm-3 col-md-3" v-if="announcementExam">
+            <datepicker
+              menu-class-name="modalfix"
+              v-model="dateRegister"
+              :locale="'th'"
+              autoApply
+              borderless
+              range
+              :enableTimePicker="false"
+              week-start="0"
+            >
+              <template #year="{ year }">
+                {{ year + 543 }}
+              </template>
+              <template #year-overlay-value="{ value }">
+                {{ parseInt(value + 543) }}
+              </template>
+              <template #trigger>
+                <q-input
+                  outlined
+                  dense
+                  class="full-width datepicker q-mb-md"
+                  :model-value="
+                    dateRegister != null ? dateThaiRange(dateRegister) : null
+                  "
+                  :label="`${'วันที่สมัคร'}`"
+                  :rules="[(val) => !!val || `${'กรุณาเลือกวันที่สมัคร'}`]"
+                >
+                  <template v-slot:prepend>
+                    <q-icon
+                      name="event"
+                      class="cursor-pointer"
+                      style="color: var(--q-primary)"
+                    >
+                    </q-icon>
+                  </template>
+                </q-input>
+              </template>
+            </datepicker>
+          </div>
+          <div class="col-xs-12 col-sm-3 col-md-3" v-if="announcementExam">
+            <datepicker
+              menu-class-name="modalfix"
+              v-model="datePayment"
+              :locale="'th'"
+              autoApply
+              borderless
+              range
+              :enableTimePicker="false"
+              week-start="0"
+            >
+              <template #year="{ year }">
+                {{ year + 543 }}
+              </template>
+              <template #year-overlay-value="{ value }">
+                {{ parseInt(value + 543) }}
+              </template>
+              <template #trigger>
+                <q-input
+                  outlined
+                  dense
+                  class="full-width datepicker q-mb-md"
+                  :model-value="
+                    datePayment != null ? dateThaiRange(datePayment) : null
+                  "
+                  :label="`${'วันที่ชำระเงิน'}`"
+                  :rules="[(val) => !!val || `${'กรุณาเลือกวันที่ชำระเงิน'}`]"
+                >
+                  <template v-slot:prepend>
+                    <q-icon
+                      name="event"
+                      class="cursor-pointer"
+                      style="color: var(--q-primary)"
+                    >
+                    </q-icon>
+                  </template>
+                </q-input>
+              </template>
+            </datepicker>
+          </div>
 
-					<div
-						class="col-xs-12 col-sm-3 col-md-3"
-						v-if="announcementExam"
-					>
-						<datepicker
-							menu-class-name="modalfix"
-							v-model="dateAnnounce"
-							:locale="'th'"
-							autoApply
-							borderless
-							:enableTimePicker="false"
-							week-start="0"
-						>
-							<template #year="{ year }">
-								{{ year + 543 }}
-							</template>
-							<template #year-overlay-value="{ value }">
-								{{ parseInt(value + 543) }}
-							</template>
-							<template #trigger>
-								<q-input
-									outlined
-									dense
-									class="full-width datepicker q-mb-md"
-									:model-value="
-										dateAnnounce != null
-											? date2Thai(dateAnnounce)
-											: null
-									"
-									:label="`${'วันประกาศผลสอบ'}`"
-									:rules="[
-										(val) =>
-											!!val ||
-											`${'กรุณาเลือกวันประกาศผลสอบ'}`,
-									]"
-								>
-									<template v-slot:prepend>
-										<q-icon
-											name="event"
-											class="cursor-pointer"
-											style="color: var(--q-primary)"
-										>
-										</q-icon>
-									</template>
-								</q-input>
-							</template>
-						</datepicker>
-					</div>
+          <div class="col-xs-12 col-sm-3 col-md-3" v-if="announcementExam">
+            <datepicker
+              menu-class-name="modalfix"
+              v-model="dateAnnounce"
+              :locale="'th'"
+              autoApply
+              borderless
+              :enableTimePicker="false"
+              week-start="0"
+            >
+              <template #year="{ year }">
+                {{ year + 543 }}
+              </template>
+              <template #year-overlay-value="{ value }">
+                {{ parseInt(value + 543) }}
+              </template>
+              <template #trigger>
+                <q-input
+                  outlined
+                  dense
+                  class="full-width datepicker q-mb-md"
+                  :model-value="
+                    dateAnnounce != null ? date2Thai(dateAnnounce) : null
+                  "
+                  :label="`${'วันประกาศผลสอบ'}`"
+                  :rules="[(val) => !!val || `${'กรุณาเลือกวันประกาศผลสอบ'}`]"
+                >
+                  <template v-slot:prepend>
+                    <q-icon
+                      name="event"
+                      class="cursor-pointer"
+                      style="color: var(--q-primary)"
+                    >
+                    </q-icon>
+                  </template>
+                </q-input>
+              </template>
+            </datepicker>
+          </div>
 
-					<div class="col-12">
-						<q-separator size="5px" color="grey-2" />
-					</div>
+          <div class="col-12">
+            <q-separator size="5px" color="grey-2" />
+          </div>
 
-					<div class="row col-12 items-top q-col-gutter-x-sm">
-						<div class="col-xs-12 col-sm-6">
-							<div class="text-bold text-subtitle2 q-pb-sm">
-								รูปภาพประกอบ
-							</div>
-							<div class="row justify-center row col-12">
-								<q-uploader
-									color="gray"
-									type="file"
-									flat
-									ref="uploader"
-									class="full-width"
-									text-color="dark"
-									:max-size="10000000"
-									accept=".jpg,.png,.pdf,.csv,.doc"
-									bordered
-									label="[ไฟล์ jpg,png,pdf,csv,doc ขนาดไม่เกิน 10MB]"
-									multiple
-									@added="fileUploadImg"
-									@removed="fileRemoveImg"
-								>
-									<template v-slot:header="scope">
-										<div
-											class="row no-wrap items-center q-pa-sm q-gutter-xs text-white"
-										>
-											<q-btn
-												v-if="
-													scope.queuedFiles.length > 0
-												"
-												icon="clear_all"
-												@click="scope.removeQueuedFiles"
-												round
-												dense
-												flat
-											>
-												<q-tooltip>ลบทั้งหมด</q-tooltip>
-											</q-btn>
-											<q-btn
-												v-if="
-													scope.uploadedFiles.length >
-													0
-												"
-												icon="done_all"
-												@click="
-													scope.removeUploadedFiles
-												"
-												round
-												dense
-												flat
-											>
-												<q-tooltip
-													>ลบไฟล์ที่อัปโหลด</q-tooltip
-												>
-											</q-btn>
-											<q-spinner
-												v-if="scope.isUploading"
-												class="q-uploader__spinner"
-											/>
-											<div class="col">
-												<div class="q-uploader__title">
-													{{
-														"[ไฟล์ jpg,png,pdf,csv,doc ขนาดไม่เกิน 10MB]"
-													}}
-												</div>
-												<div
-													class="q-uploader__subtitle"
-												>
-													{{ scope.uploadSizeLabel }}
-													/
-													{{
-														scope.uploadProgressLabel
-													}}
-												</div>
-											</div>
-											<q-btn
-												v-if="scope.canAddFiles"
-												type="a"
-												icon="add_box"
-												@click="scope.pickFiles"
-												round
-												dense
-												flat
-											>
-												<q-uploader-add-trigger />
-												<q-tooltip>เลือกไฟล์</q-tooltip>
-											</q-btn>
-											<q-btn
-												v-if="scope.isUploading"
-												icon="clear"
-												@click="scope.abort"
-												round
-												dense
-												flat
-											>
-												<q-tooltip
-													>ยกเลิกการอัปโหลด</q-tooltip
-												>
-											</q-btn>
-										</div>
-									</template>
-								</q-uploader>
-							</div>
-							<q-card
-								bordered
-								flat
-								class="full-width q-my-md"
-								v-if="fileImgs.length != 0"
-							>
-								<q-list separator>
-									<q-item
-										v-for="file in fileImgs"
-										:key="file.id"
-										class="q-my-xs"
-									>
-										<q-item-section>
-											<q-item-label
-												class="full-width ellipsis"
-											>
-												{{ file.fileName }}
-											</q-item-label>
+          <div class="row col-12 items-top q-col-gutter-x-sm">
+            <div class="col-xs-12 col-sm-6">
+              <div class="text-bold text-subtitle2 q-pb-sm">รูปภาพประกอบ</div>
+              <div class="row justify-center row col-12">
+                <q-uploader
+                  color="gray"
+                  type="file"
+                  flat
+                  ref="uploader"
+                  class="full-width"
+                  text-color="dark"
+                  :max-size="10000000"
+                  accept=".jpg,.png,.pdf,.csv,.doc"
+                  bordered
+                  label="[ไฟล์ jpg,png,pdf,csv,doc ขนาดไม่เกิน 10MB]"
+                  multiple
+                  @added="fileUploadImg"
+                  @removed="fileRemoveImg"
+                >
+                  <template v-slot:header="scope">
+                    <div
+                      class="row no-wrap items-center q-pa-sm q-gutter-xs text-white"
+                    >
+                      <q-btn
+                        v-if="scope.queuedFiles.length > 0"
+                        icon="clear_all"
+                        @click="scope.removeQueuedFiles"
+                        round
+                        dense
+                        flat
+                      >
+                        <q-tooltip>ลบทั้งหมด</q-tooltip>
+                      </q-btn>
+                      <q-btn
+                        v-if="scope.uploadedFiles.length > 0"
+                        icon="done_all"
+                        @click="scope.removeUploadedFiles"
+                        round
+                        dense
+                        flat
+                      >
+                        <q-tooltip>ลบไฟล์ที่อัปโหลด</q-tooltip>
+                      </q-btn>
+                      <q-spinner
+                        v-if="scope.isUploading"
+                        class="q-uploader__spinner"
+                      />
+                      <div class="col">
+                        <div class="q-uploader__title">
+                          {{ "[ไฟล์ jpg,png,pdf,csv,doc ขนาดไม่เกิน 10MB]" }}
+                        </div>
+                        <div class="q-uploader__subtitle">
+                          {{ scope.uploadSizeLabel }}
+                          /
+                          {{ scope.uploadProgressLabel }}
+                        </div>
+                      </div>
+                      <q-btn
+                        v-if="scope.canAddFiles"
+                        type="a"
+                        icon="add_box"
+                        @click="scope.pickFiles"
+                        round
+                        dense
+                        flat
+                      >
+                        <q-uploader-add-trigger />
+                        <q-tooltip>เลือกไฟล์</q-tooltip>
+                      </q-btn>
+                      <q-btn
+                        v-if="scope.isUploading"
+                        icon="clear"
+                        @click="scope.abort"
+                        round
+                        dense
+                        flat
+                      >
+                        <q-tooltip>ยกเลิกการอัปโหลด</q-tooltip>
+                      </q-btn>
+                    </div>
+                  </template>
+                </q-uploader>
+              </div>
+              <q-card
+                bordered
+                flat
+                class="full-width q-my-md"
+                v-if="fileImgs.length != 0"
+              >
+                <q-list separator>
+                  <q-item
+                    v-for="file in fileImgs"
+                    :key="file.id"
+                    class="q-my-xs"
+                  >
+                    <q-item-section>
+                      <q-item-label class="full-width ellipsis">
+                        {{ file.fileName }}
+                      </q-item-label>
 
-											<q-item-label caption>
-												สถานะ: {{ file.fileType }} /
-												{{ file.fileSize }}
-											</q-item-label>
-										</q-item-section>
-										<q-item-section top side>
-											<div class="q-gutter-sm">
-												<q-btn
-													size="12px"
-													flat
-													dense
-													round
-													color="blue"
-													icon="mdi-download-outline"
-													@click="
-														downloadData(
-															file.detail
-														)
-													"
-												>
-													<q-tooltip
-														>ดาวน์โหลด</q-tooltip
-													>
-												</q-btn>
-												<q-btn
-													size="12px"
-													flat
-													dense
-													round
-													color="red"
-													icon="mdi-delete-outline"
-													v-if="edit"
-													@click="
-														deleteImgData(file.id)
-													"
-												>
-													<q-tooltip
-														>ลบไฟล์</q-tooltip
-													>
-												</q-btn>
-											</div>
-										</q-item-section>
-									</q-item>
-								</q-list>
-							</q-card>
-						</div>
-						<div class="col-xs-12 col-sm-6">
-							<div class="text-bold text-subtitle2 q-pb-sm">
-								เอกสารประกอบ
-							</div>
-							<div class="row justify-center row col-12">
-								<q-uploader
-									color="gray"
-									type="file"
-									flat
-									ref="uploader"
-									class="full-width"
-									text-color="dark"
-									:max-size="10000000"
-									accept=".jpg,.png,.pdf,.csv,.doc"
-									bordered
-									label="[ไฟล์ jpg,png,pdf,csv,doc ขนาดไม่เกิน 10MB]"
-									multiple
-									@added="fileUploadDoc"
-									@removed="fileRemoveDoc"
-								>
-									<template v-slot:header="scope">
-										<div
-											class="row no-wrap items-center q-pa-sm q-gutter-xs text-white"
-										>
-											<q-btn
-												v-if="
-													scope.queuedFiles.length > 0
-												"
-												icon="clear_all"
-												@click="scope.removeQueuedFiles"
-												round
-												dense
-												flat
-											>
-												<q-tooltip>ลบทั้งหมด</q-tooltip>
-											</q-btn>
-											<q-btn
-												v-if="
-													scope.uploadedFiles.length >
-													0
-												"
-												icon="done_all"
-												@click="
-													scope.removeUploadedFiles
-												"
-												round
-												dense
-												flat
-											>
-												<q-tooltip
-													>ลบไฟล์ที่อัปโหลด</q-tooltip
-												>
-											</q-btn>
-											<q-spinner
-												v-if="scope.isUploading"
-												class="q-uploader__spinner"
-											/>
-											<div class="col">
-												<div class="q-uploader__title">
-													{{
-														"[ไฟล์ jpg,png,pdf,csv,doc ขนาดไม่เกิน 10MB]"
-													}}
-												</div>
-												<div
-													class="q-uploader__subtitle"
-												>
-													{{ scope.uploadSizeLabel }}
-													/
-													{{
-														scope.uploadProgressLabel
-													}}
-												</div>
-											</div>
-											<q-btn
-												v-if="scope.canAddFiles"
-												type="a"
-												icon="add_box"
-												@click="scope.pickFiles"
-												round
-												dense
-												flat
-											>
-												<q-uploader-add-trigger />
-												<q-tooltip>เลือกไฟล์</q-tooltip>
-											</q-btn>
-											<q-btn
-												v-if="scope.isUploading"
-												icon="clear"
-												@click="scope.abort"
-												round
-												dense
-												flat
-											>
-												<q-tooltip
-													>ยกเลิกการอัปโหลด</q-tooltip
-												>
-											</q-btn>
-										</div>
-									</template>
-								</q-uploader>
-							</div>
-							<q-card
-								bordered
-								flat
-								class="full-width q-my-md"
-								v-if="fileDocs.length != 0"
-							>
-								<q-list separator>
-									<q-item
-										v-for="file in fileDocs"
-										:key="file.id"
-										class="q-my-xs"
-									>
-										<q-item-section>
-											<q-item-label
-												class="full-width ellipsis"
-											>
-												{{ file.fileName }}
-											</q-item-label>
+                      <q-item-label caption>
+                        สถานะ: {{ file.fileType }} /
+                        {{ file.fileSize }}
+                      </q-item-label>
+                    </q-item-section>
+                    <q-item-section top side>
+                      <div class="q-gutter-sm">
+                        <q-btn
+                          size="12px"
+                          flat
+                          dense
+                          round
+                          color="blue"
+                          icon="mdi-download-outline"
+                          @click="downloadData(file.detail)"
+                        >
+                          <q-tooltip>ดาวน์โหลด</q-tooltip>
+                        </q-btn>
+                        <q-btn
+                          size="12px"
+                          flat
+                          dense
+                          round
+                          color="red"
+                          icon="mdi-delete-outline"
+                          v-if="edit"
+                          @click="deleteImgData(file.id)"
+                        >
+                          <q-tooltip>ลบไฟล์</q-tooltip>
+                        </q-btn>
+                      </div>
+                    </q-item-section>
+                  </q-item>
+                </q-list>
+              </q-card>
+            </div>
+            <div class="col-xs-12 col-sm-6">
+              <div class="text-bold text-subtitle2 q-pb-sm">เอกสารประกอบ</div>
+              <div class="row justify-center row col-12">
+                <q-uploader
+                  color="gray"
+                  type="file"
+                  flat
+                  ref="uploader"
+                  class="full-width"
+                  text-color="dark"
+                  :max-size="10000000"
+                  accept=".jpg,.png,.pdf,.csv,.doc"
+                  bordered
+                  label="[ไฟล์ jpg,png,pdf,csv,doc ขนาดไม่เกิน 10MB]"
+                  multiple
+                  @added="fileUploadDoc"
+                  @removed="fileRemoveDoc"
+                >
+                  <template v-slot:header="scope">
+                    <div
+                      class="row no-wrap items-center q-pa-sm q-gutter-xs text-white"
+                    >
+                      <q-btn
+                        v-if="scope.queuedFiles.length > 0"
+                        icon="clear_all"
+                        @click="scope.removeQueuedFiles"
+                        round
+                        dense
+                        flat
+                      >
+                        <q-tooltip>ลบทั้งหมด</q-tooltip>
+                      </q-btn>
+                      <q-btn
+                        v-if="scope.uploadedFiles.length > 0"
+                        icon="done_all"
+                        @click="scope.removeUploadedFiles"
+                        round
+                        dense
+                        flat
+                      >
+                        <q-tooltip>ลบไฟล์ที่อัปโหลด</q-tooltip>
+                      </q-btn>
+                      <q-spinner
+                        v-if="scope.isUploading"
+                        class="q-uploader__spinner"
+                      />
+                      <div class="col">
+                        <div class="q-uploader__title">
+                          {{ "[ไฟล์ jpg,png,pdf,csv,doc ขนาดไม่เกิน 10MB]" }}
+                        </div>
+                        <div class="q-uploader__subtitle">
+                          {{ scope.uploadSizeLabel }}
+                          /
+                          {{ scope.uploadProgressLabel }}
+                        </div>
+                      </div>
+                      <q-btn
+                        v-if="scope.canAddFiles"
+                        type="a"
+                        icon="add_box"
+                        @click="scope.pickFiles"
+                        round
+                        dense
+                        flat
+                      >
+                        <q-uploader-add-trigger />
+                        <q-tooltip>เลือกไฟล์</q-tooltip>
+                      </q-btn>
+                      <q-btn
+                        v-if="scope.isUploading"
+                        icon="clear"
+                        @click="scope.abort"
+                        round
+                        dense
+                        flat
+                      >
+                        <q-tooltip>ยกเลิกการอัปโหลด</q-tooltip>
+                      </q-btn>
+                    </div>
+                  </template>
+                </q-uploader>
+              </div>
+              <q-card
+                bordered
+                flat
+                class="full-width q-my-md"
+                v-if="fileDocs.length != 0"
+              >
+                <q-list separator>
+                  <q-item
+                    v-for="file in fileDocs"
+                    :key="file.id"
+                    class="q-my-xs"
+                  >
+                    <q-item-section>
+                      <q-item-label class="full-width ellipsis">
+                        {{ file.fileName }}
+                      </q-item-label>
 
-											<q-item-label caption>
-												สถานะ: {{ file.fileType }} /
-												{{ file.fileSize }}
-											</q-item-label>
-										</q-item-section>
-										<q-item-section top side>
-											<div class="q-gutter-sm">
-												<q-btn
-													size="12px"
-													flat
-													dense
-													round
-													color="blue"
-													icon="mdi-download-outline"
-													@click="
-														downloadData(
-															file.detail
-														)
-													"
-												>
-													<q-tooltip
-														>ดาวน์โหลด</q-tooltip
-													>
-												</q-btn>
-												<q-btn
-													size="12px"
-													flat
-													dense
-													round
-													color="red"
-													icon="mdi-delete-outline"
-													v-if="edit"
-													@click="
-														deleteDocData(file.id)
-													"
-												>
-													<q-tooltip
-														>ลบไฟล์</q-tooltip
-													>
-												</q-btn>
-											</div>
-										</q-item-section>
-									</q-item>
-								</q-list>
-							</q-card>
-						</div>
-					</div>
-					<div class="col-12">
-						<q-separator
-							size="5px"
-							color="grey-2"
-							class="q-my-lg"
-						/>
-					</div>
+                      <q-item-label caption>
+                        สถานะ: {{ file.fileType }} /
+                        {{ file.fileSize }}
+                      </q-item-label>
+                    </q-item-section>
+                    <q-item-section top side>
+                      <div class="q-gutter-sm">
+                        <q-btn
+                          size="12px"
+                          flat
+                          dense
+                          round
+                          color="blue"
+                          icon="mdi-download-outline"
+                          @click="downloadData(file.detail)"
+                        >
+                          <q-tooltip>ดาวน์โหลด</q-tooltip>
+                        </q-btn>
+                        <q-btn
+                          size="12px"
+                          flat
+                          dense
+                          round
+                          color="red"
+                          icon="mdi-delete-outline"
+                          v-if="edit"
+                          @click="deleteDocData(file.id)"
+                        >
+                          <q-tooltip>ลบไฟล์</q-tooltip>
+                        </q-btn>
+                      </div>
+                    </q-item-section>
+                  </q-item>
+                </q-list>
+              </q-card>
+            </div>
+          </div>
+          <div class="col-12">
+            <q-separator size="5px" color="grey-2" class="q-my-lg" />
+          </div>
 
-					<div class="col-12">
-						<div class="text-bold text-subtitle2 q-pb-sm q-pt-md">
-							รายละเอียด
-						</div>
-						<q-editor
-							v-model="editor"
-							:dense="$q.screen.lt.md"
-							toolbar-text-color="blue-grey-10"
-							toolbar-bg="blue-grey-2"
-							toolbar-toggle-color="blue-grey-8"
-							class="editor"
-							:toolbar="[
-								['left', 'center', 'right', 'justify'],
-								[
-									'bold',
-									'italic',
-									'strike',
-									'underline',
-									'subscript',
-									'superscript',
-								],
-								['token', 'hr', 'link', 'custom_btn'],
-								['print', 'fullscreen'],
-								[
-									{
-										label: $q.lang.editor.formatting,
-										icon: $q.iconSet.editor.formatting,
-										list: 'no-icons',
-										options: ['p', 'h1', 'h2', 'h3'],
-									},
-									{
-										label: $q.lang.editor.defaultFont,
-										icon: $q.iconSet.editor.font,
-										fixedIcon: true,
-										list: 'no-icons',
-										options: [
-											'default_font',
-											'arial',
-											'arial_black',
-											'comic_sans',
-											'courier_new',
-											'impact',
-											'lucida_grande',
-											'times_new_roman',
-											'verdana',
-										],
-									},
-									'removeFormat',
-								],
-								['undo', 'redo'],
-								['viewsource'],
-							]"
-							:fonts="{
-								arial: 'Arial',
-								arial_black: 'Arial Black',
-								comic_sans: 'Comic Sans MS',
-								courier_new: 'Courier New',
-								impact: 'Impact',
-								lucida_grande: 'Lucida Grande',
-								times_new_roman: 'Times New Roman',
-								verdana: 'Verdana',
-							}"
-						/>
-					</div>
-					<div class="col-12 q-mt-md">
-						<q-input
-							outlined
-							v-model="note"
-							label="หมายเหตุ"
-							dense
-							lazy-rules
-							type="textarea"
-						/>
-					</div>
-				</div>
-			</q-card-section>
-			<q-separator />
-			<q-card-actions class="text-primary q-py-sm">
-				<q-space />
-				<q-btn
-					flat
-					round
-					color="public"
-					@click="checkSave"
-					icon="mdi-content-save-outline"
-				>
-					<q-tooltip>{{
-						edit ? "แก้ไขข้อมูล" : "บันทึกข้อมูล"
-					}}</q-tooltip>
-				</q-btn>
-			</q-card-actions>
-		</q-form>
-	</q-card>
+          <div class="col-12">
+            <div class="text-bold text-subtitle2 q-pb-sm q-pt-md">
+              รายละเอียด
+            </div>
+            <q-editor
+              v-model="editor"
+              :dense="$q.screen.lt.md"
+              toolbar-text-color="blue-grey-10"
+              toolbar-bg="blue-grey-2"
+              toolbar-toggle-color="blue-grey-8"
+              class="editor"
+              :toolbar="[
+                ['left', 'center', 'right', 'justify'],
+                [
+                  'bold',
+                  'italic',
+                  'strike',
+                  'underline',
+                  'subscript',
+                  'superscript',
+                ],
+                ['token', 'hr', 'link', 'custom_btn'],
+                ['print', 'fullscreen'],
+                [
+                  {
+                    label: $q.lang.editor.formatting,
+                    icon: $q.iconSet.editor.formatting,
+                    list: 'no-icons',
+                    options: ['p', 'h1', 'h2', 'h3'],
+                  },
+                  {
+                    label: $q.lang.editor.defaultFont,
+                    icon: $q.iconSet.editor.font,
+                    fixedIcon: true,
+                    list: 'no-icons',
+                    options: [
+                      'default_font',
+                      'arial',
+                      'arial_black',
+                      'comic_sans',
+                      'courier_new',
+                      'impact',
+                      'lucida_grande',
+                      'times_new_roman',
+                      'verdana',
+                    ],
+                  },
+                  'removeFormat',
+                ],
+                ['undo', 'redo'],
+                ['viewsource'],
+              ]"
+              :fonts="{
+                arial: 'Arial',
+                arial_black: 'Arial Black',
+                comic_sans: 'Comic Sans MS',
+                courier_new: 'Courier New',
+                impact: 'Impact',
+                lucida_grande: 'Lucida Grande',
+                times_new_roman: 'Times New Roman',
+                verdana: 'Verdana',
+              }"
+            />
+          </div>
+          <div class="col-12 q-mt-md">
+            <q-input
+              outlined
+              v-model="note"
+              label="หมายเหตุ"
+              dense
+              lazy-rules
+              type="textarea"
+            />
+          </div>
+        </div>
+      </q-card-section>
+      <q-separator />
+      <q-card-actions class="text-primary q-py-sm">
+        <q-space />
+        <q-btn
+          flat
+          round
+          color="public"
+          @click="checkSave"
+          icon="mdi-content-save-outline"
+        >
+          <q-tooltip>{{ edit ? "แก้ไขข้อมูล" : "บันทึกข้อมูล" }}</q-tooltip>
+        </q-btn>
+      </q-card-actions>
+    </q-form>
+  </q-card>
 </template>
 <script setup lang="ts">
 import type { QTableProps } from "quasar";
@@ -801,19 +667,18 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useRouter, useRoute } from "vue-router";
 import type { RequestPeriodCompete } from "@/modules/03_recruiting/interface/request/Period";
 import type {
-	DataOption,
-	UploadType,
+  DataOption,
+  UploadType,
 } from "@/modules/02_organizational/interface/index/Main";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-
-
 const $q = useQuasar(); // show dialog
 const mixin = useCounterMixin();
 const router = useRouter();
 const route = useRoute();
-const { date2Thai, success, dateToISO, notifyError, showLoader, hideLoader } = mixin;
+const { date2Thai, success, dateToISO, notifyError, showLoader, hideLoader } =
+  mixin;
 const myForm = ref<QForm | null>(null); //form data input
 const name = ref<string>("");
 const note = ref<string>("");
@@ -840,358 +705,344 @@ const id = ref<string>("");
 const pay = ref<string>("");
 const edit = ref<boolean>(false);
 const columnsPayment = ref<QTableProps["columns"]>([
-	{
-		name: "accountNumber",
-		align: "left",
-		label: "เลขบัญชี",
-		sortable: true,
-		field: "accountNumber",
-		headerStyle: "font-size: 14px",
-		style: "font-size: 14px",
-		sort: (a: string, b: string) =>
-			a.localeCompare(b, undefined, {
-				numeric: true,
-				sensitivity: "base",
-			}),
-	},
-	{
-		name: "bankName",
-		align: "left",
-		label: "ธนาคาร",
-		sortable: true,
-		field: "bankName",
-		headerStyle: "font-size: 14px",
-		style: "font-size: 14px",
-		sort: (a: string, b: string) =>
-			a.localeCompare(b, undefined, {
-				numeric: true,
-				sensitivity: "base",
-			}),
-	},
-	{
-		name: "accountName",
-		align: "left",
-		label: "ชื่อบัญชี",
-		sortable: true,
-		field: "accountName",
-		headerStyle: "font-size: 14px",
-		style: "font-size: 14px",
-		sort: (a: string, b: string) =>
-			a.localeCompare(b, undefined, {
-				numeric: true,
-				sensitivity: "base",
-			}),
-	},
+  {
+    name: "accountNumber",
+    align: "left",
+    label: "เลขบัญชี",
+    sortable: true,
+    field: "accountNumber",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, {
+        numeric: true,
+        sensitivity: "base",
+      }),
+  },
+  {
+    name: "bankName",
+    align: "left",
+    label: "ธนาคาร",
+    sortable: true,
+    field: "bankName",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, {
+        numeric: true,
+        sensitivity: "base",
+      }),
+  },
+  {
+    name: "accountName",
+    align: "left",
+    label: "ชื่อบัญชี",
+    sortable: true,
+    field: "accountName",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, {
+        numeric: true,
+        sensitivity: "base",
+      }),
+  },
 ]);
 const visibleColumnsPosition = ref<String[]>(["position", "type"]);
 const columnsPosition = ref<QTableProps["columns"]>([
-	{
-		name: "position",
-		align: "left",
-		label: "ตำแหน่ง",
-		sortable: true,
-		field: "position",
-		headerStyle: "font-size: 14px",
-		style: "font-size: 14px",
-		sort: (a: string, b: string) =>
-			a.localeCompare(b, undefined, {
-				numeric: true,
-				sensitivity: "base",
-			}),
-	},
-	{
-		name: "type",
-		align: "left",
-		label: "ประเภทแบบฟอร์ม",
-		sortable: true,
-		field: "type",
-		headerStyle: "font-size: 14px",
-		style: "font-size: 14px",
-		sort: (a: string, b: string) =>
-			a.localeCompare(b, undefined, {
-				numeric: true,
-				sensitivity: "base",
-			}),
-	},
+  {
+    name: "position",
+    align: "left",
+    label: "ตำแหน่ง",
+    sortable: true,
+    field: "position",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, {
+        numeric: true,
+        sensitivity: "base",
+      }),
+  },
+  {
+    name: "type",
+    align: "left",
+    label: "ประเภทแบบฟอร์ม",
+    sortable: true,
+    field: "type",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, {
+        numeric: true,
+        sensitivity: "base",
+      }),
+  },
 ]);
 
 watch(organizationShortName, (count: DataOption, prevCount: DataOption) => {
-	organizationNameOptions.value = [];
+  organizationNameOptions.value = [];
 });
 
 watch(organizationName, (count: DataOption, prevCount: DataOption) => {
-	positionPathOptions.value = [];
+  positionPathOptions.value = [];
 });
 
 onMounted(async () => {
-	hideLoader();
-	if (route.params.id != undefined) {
-		edit.value = true;
-		id.value = route.params.id.toString();
-		await fetchData();
-	} else {
-		edit.value = false;
-	}
+  hideLoader();
+  if (route.params.id != undefined) {
+    edit.value = true;
+    id.value = route.params.id.toString();
+    await fetchData();
+  } else {
+    edit.value = false;
+  }
 });
 
 const clickBack = () => {
-	router.push({ name: "competePeriod" });
+  router.push({ name: "competePeriod" });
 };
 
 const fetchData = async () => {
-	showLoader();
-	await http
-		.get(config.API.getPeriodById(id.value))
-		.then((res) => {
-			const data = res.data.result.periods;
-			const images = res.data.result.images;
-			const files = res.data.result.files;
+  showLoader();
+  await http
+    .get(config.API.getPeriodById(id.value))
+    .then((res) => {
+      const data = res.data.result.periods;
+      const images = res.data.result.images;
+      const files = res.data.result.files;
 
-			id.value = data.id;
-			name.value = data.name;
-			round.value = data.order;
-			yearly.value = data.year;
-			fee.value = data.fee;
-			dateAnnouncement.value =
-				data.announcementStartDate != null &&
-				data.announcementEndDate != null
-					? [
-							new Date(data.announcementStartDate),
-							new Date(data.announcementEndDate),
-					  ]
-					: null;
-			dateExam.value =
-				data.examDate != null ? new Date(data.examDate) : null;
-			dateRegister.value =
-				data.registerStartDate != null && data.registerEndDate != null
-					? [
-							new Date(data.registerStartDate),
-							new Date(data.registerEndDate),
-					  ]
-					: null;
-			datePayment.value =
-				data.paymentStartDate != null && data.paymentEndDate != null
-					? [
-							new Date(data.paymentStartDate),
-							new Date(data.paymentEndDate),
-					  ]
-					: null;
+      id.value = data.id;
+      name.value = data.name;
+      round.value = data.order;
+      yearly.value = data.year;
+      fee.value = data.fee;
+      dateAnnouncement.value =
+        data.announcementStartDate != null && data.announcementEndDate != null
+          ? [
+              new Date(data.announcementStartDate),
+              new Date(data.announcementEndDate),
+            ]
+          : null;
+      dateExam.value = data.examDate != null ? new Date(data.examDate) : null;
+      dateRegister.value =
+        data.registerStartDate != null && data.registerEndDate != null
+          ? [new Date(data.registerStartDate), new Date(data.registerEndDate)]
+          : null;
+      datePayment.value =
+        data.paymentStartDate != null && data.paymentEndDate != null
+          ? [new Date(data.paymentStartDate), new Date(data.paymentEndDate)]
+          : null;
 
-			editor.value = data.detail;
-			note.value = data.note;
-			dateAnnounce.value =
-				data.announcementDate != null
-					? new Date(data.announcementDate)
-					: null;
+      editor.value = data.detail;
+      note.value = data.note;
+      dateAnnounce.value =
+        data.announcementDate != null ? new Date(data.announcementDate) : null;
 
-			fileDocs.value = files;
-			fileImgs.value = images;
-		})
-		.catch((e) => {
-			messageError($q, e);
-		})
-		.finally(() => {
-			hideLoader();
-		});
+      fileDocs.value = files;
+      fileImgs.value = images;
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
+    });
 };
 
 const fileUploadDoc = async (files: any) => {
-	files.forEach((file: any) => {
-		fileDocDataUpload.value.push(file);
-	});
+  files.forEach((file: any) => {
+    fileDocDataUpload.value.push(file);
+  });
 };
 
 const fileRemoveDoc = async (files: any) => {
-	files.forEach((file: any) => {
-		const index = fileDocDataUpload.value.findIndex(
-			(x: any) => x.__key == file.__key
-		);
-		if (index > -1) {
-			fileDocDataUpload.value.splice(index, 1);
-		}
-	});
+  files.forEach((file: any) => {
+    const index = fileDocDataUpload.value.findIndex(
+      (x: any) => x.__key == file.__key
+    );
+    if (index > -1) {
+      fileDocDataUpload.value.splice(index, 1);
+    }
+  });
 };
 
 const uploadDocData = async () => {
-	const formData = new FormData();
-	if (fileDocDataUpload.value.length > 0) {
-		fileDocDataUpload.value.forEach((file: any) => {
-			formData.append("", file);
-		});
-		showLoader();
-		await http
-			.put(config.API.periodRecruitDoc(id.value), formData)
-			.then((res) => {})
-			.catch((e) => {
-				messageError($q, e);
-			})
-			.finally(async () => {
-				hideLoader();
-				success($q, "บันทึกข้อมูลสำเร็จ");
-				clickBack();
-			});
-	} else {
-		success($q, "บันทึกข้อมูลสำเร็จ");
-		clickBack();
-	}
+  const formData = new FormData();
+  if (fileDocDataUpload.value.length > 0) {
+    fileDocDataUpload.value.forEach((file: any) => {
+      formData.append("", file);
+    });
+    showLoader();
+    await http
+      .put(config.API.periodRecruitDoc(id.value), formData)
+      .then((res) => {})
+      .catch((e) => {
+        messageError($q, e);
+      })
+      .finally(async () => {
+        hideLoader();
+        success($q, "บันทึกข้อมูลสำเร็จ");
+        clickBack();
+      });
+  } else {
+    success($q, "บันทึกข้อมูลสำเร็จ");
+    clickBack();
+  }
 };
 
 const uploadImgData = async () => {
-	if (fileImgDataUpload.value.length > 0) {
-		const formData = new FormData();
-		fileImgDataUpload.value.forEach((file: any) => {
-			formData.append("", file);
-		});
-		showLoader();
-		await http
-			.put(config.API.periodRecruitImg(id.value), formData)
-			.then((res) => {})
-			.catch((e) => {
-				messageError($q, e);
-			})
-			.finally(async () => {
-				hideLoader();
-			});
-	}
+  if (fileImgDataUpload.value.length > 0) {
+    const formData = new FormData();
+    fileImgDataUpload.value.forEach((file: any) => {
+      formData.append("", file);
+    });
+    showLoader();
+    await http
+      .put(config.API.periodRecruitImg(id.value), formData)
+      .then((res) => {})
+      .catch((e) => {
+        messageError($q, e);
+      })
+      .finally(async () => {
+        hideLoader();
+      });
+  }
 };
 
 const fileUploadImg = async (files: any) => {
-	files.forEach((file: any) => {
-		fileImgDataUpload.value.push(file);
-	});
+  files.forEach((file: any) => {
+    fileImgDataUpload.value.push(file);
+  });
 };
 
 const fileRemoveImg = async (files: any) => {
-	files.forEach((file: any) => {
-		const index = fileImgDataUpload.value.findIndex(
-			(x: any) => x.__key == file.__key
-		);
-		if (index > -1) {
-			fileImgDataUpload.value.splice(index, 1);
-		}
-	});
+  files.forEach((file: any) => {
+    const index = fileImgDataUpload.value.findIndex(
+      (x: any) => x.__key == file.__key
+    );
+    if (index > -1) {
+      fileImgDataUpload.value.splice(index, 1);
+    }
+  });
 };
 
 const downloadData = async (path: string) => {
-	window.open(path);
+  window.open(path);
 };
 
 const updateYear = async (e: number) => {
-	yearly.value = e;
+  yearly.value = e;
 };
 
 const checkSave = async () => {
-	if (myForm.value !== null) {
-		myForm.value.validate().then(async (success) => {
-			if (success) {
-				if (edit.value) {
-					await editData(id.value);
-				} else {
-					await addData();
-				}
-			}
-		});
-	}
+  if (myForm.value !== null) {
+    myForm.value.validate().then(async (success) => {
+      if (success) {
+        if (edit.value) {
+          await editData(id.value);
+        } else {
+          await addData();
+        }
+      }
+    });
+  }
 };
 
 const sendData = () => {
-	const valueData: RequestPeriodCompete = {
-		announcementEndDate:
-			dateAnnouncement.value !== null
-				? dateToISO(dateAnnouncement.value[1])
-				: null,
-		announcementStartDate:
-			dateAnnouncement.value !== null
-				? dateToISO(dateAnnouncement.value[0])
-				: null,
-		examDate: dateExam.value !== null ? dateToISO(dateExam.value) : null,
-		detail: editor.value,
-		fee: fee.value,
-		id: "",
-		name: name.value,
-		note: note.value,
-		paymentEndDate:
-			datePayment.value !== null ? dateToISO(datePayment.value[1]) : null,
-		paymentStartDate:
-			datePayment.value !== null ? dateToISO(datePayment.value[0]) : null,
-		registerEndDate:
-			dateRegister.value !== null
-				? dateToISO(dateRegister.value[1])
-				: null,
-		registerStartDate:
-			dateRegister.value !== null
-				? dateToISO(dateRegister.value[0])
-				: null,
-		order: round.value,
-		year: yearly.value,
-		announcementDate:
-			dateAnnounce.value !== null ? dateToISO(dateAnnounce.value) : null,
-	};
-	return valueData;
+  const valueData: RequestPeriodCompete = {
+    announcementEndDate:
+      dateAnnouncement.value !== null
+        ? dateToISO(dateAnnouncement.value[1])
+        : null,
+    announcementStartDate:
+      dateAnnouncement.value !== null
+        ? dateToISO(dateAnnouncement.value[0])
+        : null,
+    examDate: dateExam.value !== null ? dateToISO(dateExam.value) : null,
+    detail: editor.value,
+    fee: fee.value,
+    id: "",
+    name: name.value,
+    note: note.value,
+    paymentEndDate:
+      datePayment.value !== null ? dateToISO(datePayment.value[1]) : null,
+    paymentStartDate:
+      datePayment.value !== null ? dateToISO(datePayment.value[0]) : null,
+    registerEndDate:
+      dateRegister.value !== null ? dateToISO(dateRegister.value[1]) : null,
+    registerStartDate:
+      dateRegister.value !== null ? dateToISO(dateRegister.value[0]) : null,
+    order: round.value,
+    year: yearly.value,
+    announcementDate:
+      dateAnnounce.value !== null ? dateToISO(dateAnnounce.value) : null,
+  };
+  return valueData;
 };
 
 const deleteDocData = async (docId: string) => {
-	showLoader();
-	await http
-		.delete(config.API.periodDeleteDoc(docId))
-		.then(async () => {
-			await fetchData();
-		})
-		.catch((e) => {
-			messageError($q, e);
-		})
-		.finally(async () => {
-			hideLoader();
-		});
+  showLoader();
+  await http
+    .delete(config.API.periodDeleteDoc(docId))
+    .then(async () => {
+      await fetchData();
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(async () => {
+      hideLoader();
+    });
 };
 
 const deleteImgData = async (docId: string) => {
-	showLoader();
-	await http
-		.delete(config.API.periodDeleteImg(docId))
-		.then(async () => {
-			await fetchData();
-		})
-		.catch((e) => {
-			messageError($q, e);
-		})
-		.finally(async () => {
-			hideLoader();
-		});
+  showLoader();
+  await http
+    .delete(config.API.periodDeleteImg(docId))
+    .then(async () => {
+      await fetchData();
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(async () => {
+      hideLoader();
+    });
 };
 
 const addData = async () => {
-	showLoader();
-	await http
-		.post(config.API.savePeriod, sendData())
-		.then(async (res) => {
-			const data = res.data.result;
-			id.value = data.id;
-			await uploadImgData();
-			await uploadDocData();
-		})
-		.catch((e) => {
-			messageError($q, e);
-		})
-		.finally(async () => {
-			hideLoader();
-		});
+  showLoader();
+  await http
+    .post(config.API.savePeriod, sendData())
+    .then(async (res) => {
+      const data = res.data.result;
+      id.value = data.id;
+      await uploadImgData();
+      await uploadDocData();
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(async () => {
+      hideLoader();
+    });
 };
 
 const editData = async (id: string) => {
-	showLoader();
-	await http
-		.put(config.API.editPeriod(id), sendData())
-		.then(async () => {
-			await uploadImgData();
-			await uploadDocData();
-		})
-		.catch((e) => {
-			messageError($q, e);
-		})
-		.finally(async () => {
-			hideLoader();
-		});
+  showLoader();
+  await http
+    .put(config.API.editPeriod(id), sendData())
+    .then(async () => {
+      await uploadImgData();
+      await uploadDocData();
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(async () => {
+      hideLoader();
+    });
 };
 
 /**
@@ -1199,13 +1050,13 @@ const editData = async (id: string) => {
  * @param val ช่วงวันที่
  */
 const dateThaiRange = (val: [Date, Date]) => {
-	if (val === null) {
-		return "";
-	} else if (date2Thai(val[0], true) === date2Thai(val[1], true)) {
-		return `${date2Thai(val[0], true)}`;
-	} else {
-		return `${date2Thai(val[0], true)} - ${date2Thai(val[1], true)}`;
-	}
+  if (val === null) {
+    return "";
+  } else if (date2Thai(val[0], true) === date2Thai(val[1], true)) {
+    return `${date2Thai(val[0], true)}`;
+  } else {
+    return `${date2Thai(val[0], true)} - ${date2Thai(val[1], true)}`;
+  }
 };
 </script>
 
diff --git a/src/modules/03_recruiting/views/02_qualify/DisablePeriodAdd.vue b/src/modules/03_recruiting/views/02_qualify/DisablePeriodAdd.vue
index 1b1b106cc..e506a8f23 100644
--- a/src/modules/03_recruiting/views/02_qualify/DisablePeriodAdd.vue
+++ b/src/modules/03_recruiting/views/02_qualify/DisablePeriodAdd.vue
@@ -61,7 +61,7 @@
               <template #trigger>
                 <q-input
                   dense
-                  lazy-rules
+                  
                   outlined
                   :model-value="yearly + 543"
                   :rules="[(val) => !!val || `${'กรุณาเลือกปีงบประมาณ'}`]"
diff --git a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
index caac16aa4..10945c281 100644
--- a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
+++ b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
@@ -88,7 +88,6 @@
               <template #trigger>
                 <q-input
                   dense
-                  lazy-rules
                   outlined
                   :model-value="yearly + 543"
                   :rules="[(val) => !!val || `${'กรุณาเลือกปีงบประมาณ'}`]"
diff --git a/src/modules/04_registry/components/Coin.vue b/src/modules/04_registry/components/Coin.vue
index 6d1fbfa15..7e2b112e9 100644
--- a/src/modules/04_registry/components/Coin.vue
+++ b/src/modules/04_registry/components/Coin.vue
@@ -144,7 +144,7 @@ a
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
+                    
                     :borderless="!edit"
                     :model-value="issueDate + 543"
                     hide-bottom-space
@@ -186,7 +186,7 @@ a
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
+                    
                     :borderless="!edit"
                     :model-value="date2Thai(issueDate2)"
                     :rules="[(val) => !!val || `${'กรุณาเลือกวันที่ได้รับ'}`]"
@@ -293,7 +293,7 @@ a
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
+                    
                     :borderless="!edit"
                     :model-value="
                       refCommandDate == null ? null : date2Thai(refCommandDate)
diff --git a/src/modules/04_registry/components/DialogFormLeave.vue b/src/modules/04_registry/components/DialogFormLeave.vue
index aa8637018..f7da034d6 100644
--- a/src/modules/04_registry/components/DialogFormLeave.vue
+++ b/src/modules/04_registry/components/DialogFormLeave.vue
@@ -130,7 +130,7 @@ watch(
                 <template #trigger>
                   <q-input
                     dense
-                    lazy-rules
+                    
                     hide-bottom-space
                     :rules="[(val:string) => !!val || `${'กรุณาเลือกปี'}`]"
                     :class="inputEdit(isReadonly)"
diff --git a/src/modules/04_registry/components/Discipline.vue b/src/modules/04_registry/components/Discipline.vue
index d87365b21..7edfe8b8f 100644
--- a/src/modules/04_registry/components/Discipline.vue
+++ b/src/modules/04_registry/components/Discipline.vue
@@ -92,7 +92,7 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
+                    
                     :borderless="!edit"
                     :model-value="date2Thai(date)"
                     :rules="[(val:string) => !!val || `${'กรุณาเลือก วัน/เดือน/ปี'}`]"
@@ -219,7 +219,7 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
+                    
                     :borderless="!edit"
                     :model-value="
                       (refCommandDate && date2Thai(refCommandDate as Date)) || null
diff --git a/src/modules/04_registry/components/Education.vue b/src/modules/04_registry/components/Education.vue
index fd3b477fc..77f562886 100644
--- a/src/modules/04_registry/components/Education.vue
+++ b/src/modules/04_registry/components/Education.vue
@@ -174,7 +174,7 @@
                             :class="getClass(edit)"
                             :outlined="edit"
                             dense
-                            lazy-rules
+                           
                             :borderless="!edit"
                             :model-value="Number(startDate) + 543"
                             :rules="[
@@ -233,7 +233,7 @@
                             :class="getClass(edit)"
                             :outlined="edit"
                             dense
-                            lazy-rules
+                            
                             :borderless="!edit"
                             :model-value="date2Thai(startDate2 as Date)"
                             :rules="[
@@ -297,7 +297,7 @@
                             :class="getClass(edit)"
                             :outlined="edit"
                             dense
-                            lazy-rules
+                         
                             :borderless="!edit"
                             :model-value="Number(endDate) + 543"
                             :rules="[
@@ -355,7 +355,7 @@
                             :class="getClass(edit)"
                             :outlined="edit"
                             dense
-                            lazy-rules
+                            
                             :borderless="!edit"
                             :model-value="date2Thai(endDate2 as Date)"
                             :rules="[
@@ -415,7 +415,7 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
+                    
                     :borderless="!edit"
                     :model-value="finishDate ? date2Thai(finishDate as Date) : null"
                     hide-bottom-space
diff --git a/src/modules/04_registry/components/Information/Certicate.vue b/src/modules/04_registry/components/Information/Certicate.vue
index 7ea3f7d8e..556e4c56b 100644
--- a/src/modules/04_registry/components/Information/Certicate.vue
+++ b/src/modules/04_registry/components/Information/Certicate.vue
@@ -11,7 +11,9 @@
         v-model:inputvisible="visibleColumns"
         :add="clickAdd"
         :name="
-          profileType == 'employee' ? 'ใบอนุญาตของลูกจ้าง' : 'ใบอนุญาตประกอบวิชาชีพ'
+          profileType == 'employee'
+            ? 'ใบอนุญาตของลูกจ้าง'
+            : 'ใบอนุญาตประกอบวิชาชีพ'
         "
         icon="mdi-book"
         :statusEdit="statusEdit"
@@ -59,7 +61,9 @@
       <q-form ref="myForm">
         <DialogHeader
           :tittle="
-            profileType == 'employee' ? 'ใบอนุญาตของลูกจ้าง' : 'ใบอนุญาตประกอบวิชาชีพ'
+            profileType == 'employee'
+              ? 'ใบอนุญาตของลูกจ้าง'
+              : 'ใบอนุญาตประกอบวิชาชีพ'
           "
           :close="clickClose"
         />
@@ -192,7 +196,6 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(expireDate as Date)"
                     :label="`${'วันที่หมดอายุ'}`"
@@ -515,14 +518,14 @@ const fetchData = async () => {
             id: e.id,
             certificateNo: e.certificateNo,
             issuer: e.issuer,
-            issueDate: e.issueDate !== null ? new Date(e.issueDate):null,
-            expireDate: e.expireDate !== null ? new Date(e.expireDate):null,
+            issueDate: e.issueDate !== null ? new Date(e.issueDate) : null,
+            expireDate: e.expireDate !== null ? new Date(e.expireDate) : null,
             certificateType: e.certificateType,
             createdFullName: e.createdFullName,
             createdAt: new Date(e.createdAt),
           });
-          console.log(rows.value)
-          console.log(data)
+          console.log(rows.value);
+          console.log(data);
         });
       })
       .catch((e) => {
@@ -564,8 +567,10 @@ const getData = () => {
   issuer.value = row.issuer;
   issueDate.value = row.issueDate;
   expireDate.value = row.expireDate;
-  inputIssueDate.value = row.issueDate !== null ? convertDateDisplay(row.issueDate as Date):'';
-  inputExpireDate.value = row.expireDate !== null ? convertDateDisplay(row.expireDate as Date):'';
+  inputIssueDate.value =
+    row.issueDate !== null ? convertDateDisplay(row.issueDate as Date) : "";
+  inputExpireDate.value =
+    row.expireDate !== null ? convertDateDisplay(row.expireDate as Date) : "";
   certificateType.value = row.certificateType;
   id.value = row.id;
 };
@@ -626,8 +631,8 @@ const saveData = async () => {
       id: id.value,
       certificateNo: certificateNo.value,
       issuer: issuer.value,
-      issueDate: issueDate.value ? dateToISO(issueDate.value as Date):null,
-      expireDate: expireDate.value ? dateToISO(expireDate.value as Date):null,
+      issueDate: issueDate.value ? dateToISO(issueDate.value as Date) : null,
+      expireDate: expireDate.value ? dateToISO(expireDate.value as Date) : null,
       certificateType: certificateType.value,
     })
     .then((res) => {
@@ -652,8 +657,8 @@ const editData = async () => {
       id: id.value,
       certificateNo: certificateNo.value,
       issuer: issuer.value,
-      issueDate: issueDate.value ? dateToISO(issueDate.value as Date):null,
-      expireDate: expireDate.value ? dateToISO(expireDate.value as Date):null,
+      issueDate: issueDate.value ? dateToISO(issueDate.value as Date) : null,
+      expireDate: expireDate.value ? dateToISO(expireDate.value as Date) : null,
       certificateType: certificateType.value,
     })
     .then((res) => {
@@ -736,8 +741,14 @@ const selectData = async (props: DataProps) => {
   issuer.value = props.row.issuer;
   issueDate.value = props.row.issueDate;
   expireDate.value = props.row.expireDate;
-  inputIssueDate.value = props.row.issueDate !== null ? convertDateDisplay(props.row.issueDate as Date):'';
-  inputExpireDate.value = props.row.expireDate !== null ? convertDateDisplay(props.row.expireDate as Date):'';
+  inputIssueDate.value =
+    props.row.issueDate !== null
+      ? convertDateDisplay(props.row.issueDate as Date)
+      : "";
+  inputExpireDate.value =
+    props.row.expireDate !== null
+      ? convertDateDisplay(props.row.expireDate as Date)
+      : "";
   certificateType.value = props.row.certificateType;
   id.value = props.row.id;
   await checkRowPage();
@@ -858,8 +869,8 @@ watch(
       } else {
         inputIssueDate.value = "";
       }
-    }else if(value.length === 0){
-      issueDate.value = null
+    } else if (value.length === 0) {
+      issueDate.value = null;
     }
   }
 );
@@ -874,8 +885,8 @@ watch(
       } else {
         inputExpireDate.value = "";
       }
-    }else if(value.length === 0){
-      expireDate.value = null
+    } else if (value.length === 0) {
+      expireDate.value = null;
     }
   }
 );
diff --git a/src/modules/04_registry/components/Information/Government.vue b/src/modules/04_registry/components/Information/Government.vue
index 868d09d95..131565ace 100644
--- a/src/modules/04_registry/components/Information/Government.vue
+++ b/src/modules/04_registry/components/Information/Government.vue
@@ -157,7 +157,7 @@
                 hide-bottom-space
                 :outlined="edit"
                 dense
-                lazy-rules
+               
                 :readonly="!edit"
                 :borderless="!edit"
                 :model-value="
@@ -228,7 +228,7 @@
                 hide-bottom-space
                 :outlined="edit"
                 dense
-                lazy-rules
+                l
                 :readonly="!edit"
                 :borderless="!edit"
                 :model-value="
diff --git a/src/modules/04_registry/components/Information/Information.vue b/src/modules/04_registry/components/Information/Information.vue
index bdbec5635..33024130f 100644
--- a/src/modules/04_registry/components/Information/Information.vue
+++ b/src/modules/04_registry/components/Information/Information.vue
@@ -1187,7 +1187,7 @@ const getClass = (val: boolean) => {
 };
 
 // change date input
-const inputBirthDate = ref<string>("");
+const inputBirthDate = ref<any>("");
 const dayChecked = ref<boolean>(false);
 watch(
   () => inputBirthDate.value,
diff --git a/src/modules/04_registry/components/Insignia.vue b/src/modules/04_registry/components/Insignia.vue
index 2cd871804..e07552b89 100644
--- a/src/modules/04_registry/components/Insignia.vue
+++ b/src/modules/04_registry/components/Insignia.vue
@@ -101,7 +101,7 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
+                    
                     :borderless="!edit"
                     :model-value="year !== 0 ? (year as number) + 543:null"
                     :rules="[
@@ -160,7 +160,7 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
+                    
                     :borderless="!edit"
                     :model-value="date2Thai(receiveDate as Date)"
                     :rules="[(val:string) => !!val || `${'กรุณากรอก วัน/เดือน/ปี ที่ได้รับ'}`]"
@@ -341,7 +341,7 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
+                    
                     :borderless="!edit"
                     :model-value="date2Thai(dateAnnounce as Date)"
                     hide-bottom-space
@@ -426,7 +426,7 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
+                    
                     :borderless="!edit"
                     :model-value="
                       refCommandDate == null ? null : date2Thai(refCommandDate as Date)
diff --git a/src/modules/04_registry/components/Leave.vue b/src/modules/04_registry/components/Leave.vue
index bd7e68bd0..1f3b36863 100644
--- a/src/modules/04_registry/components/Leave.vue
+++ b/src/modules/04_registry/components/Leave.vue
@@ -246,7 +246,7 @@
                 <template #trigger>
                   <q-input
                     dense
-                    lazy-rules
+                    
                     hide-bottom-space
                     :rules="[(val:string) => !!val || `${'กรุณาเลือกปี'}`]"
                     :class="getClass(edit)"
diff --git a/src/modules/04_registry/components/Other.vue b/src/modules/04_registry/components/Other.vue
index 27374a881..8d1f582d0 100644
--- a/src/modules/04_registry/components/Other.vue
+++ b/src/modules/04_registry/components/Other.vue
@@ -87,7 +87,7 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
+                    
                     :borderless="!edit"
                     :model-value="date2Thai(date)"
                     :label="`${'วันที่'}`"
diff --git a/src/modules/04_registry/components/Profile.vue b/src/modules/04_registry/components/Profile.vue
index d2590eb12..930e04a59 100644
--- a/src/modules/04_registry/components/Profile.vue
+++ b/src/modules/04_registry/components/Profile.vue
@@ -692,7 +692,7 @@
                   class="full-width inputgreen cursor-pointer"
                   outlined
                   dense
-                  lazy-rules
+                  
                   :model-value="date2Thai(leaveDate)"
                   :rules="[(val) => !!val || `${'กรุณาเลือกวันที่พ้นราชการ'}`]"
                   hide-bottom-space
@@ -757,7 +757,7 @@
                   class="full-width inputgreen cursor-pointer"
                   outlined
                   dense
-                  lazy-rules
+                  
                   :model-value="date2Thai(leaveDateOrder)"
                   :rules="[(val) => !!val || `${'กรุณาเลือกวันที่ออกคำสั่ง'}`]"
                   hide-bottom-space
diff --git a/src/modules/04_registry/components/Record.vue b/src/modules/04_registry/components/Record.vue
index 28d797cd9..4a4186f55 100644
--- a/src/modules/04_registry/components/Record.vue
+++ b/src/modules/04_registry/components/Record.vue
@@ -98,7 +98,7 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
+                    
                     :borderless="!edit"
                     :model-value="date2Thai(date)"
                     :rules="[(val) => !!val || `${'กรุณาเลือก วัน/เดือน/ปี'}`]"
@@ -208,7 +208,7 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
+                    
                     :borderless="!edit"
                     :model-value="
                       refCommandDate == null ? null : date2Thai(refCommandDate as Date)
diff --git a/src/modules/04_registry/components/Salary.vue b/src/modules/04_registry/components/Salary.vue
index 751eae415..079629228 100644
--- a/src/modules/04_registry/components/Salary.vue
+++ b/src/modules/04_registry/components/Salary.vue
@@ -150,7 +150,7 @@
                             :class="getClass(edit)"
                             :outlined="edit"
                             dense
-                            lazy-rules
+                            
                             :borderless="!edit"
                             :model-value="date2Thai(formDataSalary.date)"
                             :rules="[
diff --git a/src/modules/04_registry/components/SalaryEmployee.vue b/src/modules/04_registry/components/SalaryEmployee.vue
index c39476167..5421345db 100644
--- a/src/modules/04_registry/components/SalaryEmployee.vue
+++ b/src/modules/04_registry/components/SalaryEmployee.vue
@@ -142,7 +142,7 @@
                             :class="getClass(edit)"
                             :outlined="edit"
                             dense
-                            lazy-rules
+                            
                             :borderless="!edit"
                             :model-value="date2Thai(date)"
                             :rules="[
diff --git a/src/modules/04_registry/components/SalaryEmployeeTemp.vue b/src/modules/04_registry/components/SalaryEmployeeTemp.vue
index 7dced843a..f529e7cfe 100644
--- a/src/modules/04_registry/components/SalaryEmployeeTemp.vue
+++ b/src/modules/04_registry/components/SalaryEmployeeTemp.vue
@@ -142,7 +142,7 @@
                             :class="getClass(edit)"
                             :outlined="edit"
                             dense
-                            lazy-rules
+                            
                             :borderless="!edit"
                             :model-value="date2Thai(date)"
                             :rules="[
diff --git a/src/modules/04_registry/components/Train.vue b/src/modules/04_registry/components/Train.vue
index 8ad6294e1..e52f151b8 100644
--- a/src/modules/04_registry/components/Train.vue
+++ b/src/modules/04_registry/components/Train.vue
@@ -168,7 +168,6 @@
                             :class="getClass(edit)"
                             :outlined="edit"
                             dense
-                            lazy-rules
                             :borderless="!edit"
                             :model-value="
                               startDate !== 0 ? Number(startDate) + 543 : null
@@ -221,7 +220,6 @@
                             :class="getClass(edit)"
                             :outlined="edit"
                             dense
-                            lazy-rules
                             :borderless="!edit"
                             :model-value="startDate2 ? date2Thai(startDate2 as Date):null"
                             :rules="[
@@ -282,7 +280,6 @@
                             :class="getClass(edit)"
                             :outlined="edit"
                             dense
-                            lazy-rules
                             :borderless="!edit"
                             :model-value="
                               endDate !== 0 ? Number(endDate) + 543 : null
@@ -340,7 +337,6 @@
                             :class="getClass(edit)"
                             :outlined="edit"
                             dense
-                            lazy-rules
                             :borderless="!edit"
                             :model-value="endDate2 ? date2Thai(endDate2 as Date):null"
                             :rules="[
@@ -402,7 +398,6 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="yearly == 0 ? null : Number(yearly + 543)"
                     :label="`${'ปีงบประมาณ'}`"
@@ -520,7 +515,6 @@
                     hide-bottom-space
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(dateOrder as Date)"
                     :label="`${'คำสั่งลง วัน/เดือน/ปี /หนังสืออนุมัติลงวันที่'}`"
@@ -1465,8 +1459,7 @@ watch(
       } else {
         inputStartDate2.value = "";
       }
-    }
-    else if (value.length === 0) {
+    } else if (value.length === 0) {
       startDate2.value = null;
     }
   }
@@ -1481,8 +1474,7 @@ watch(
       } else {
         inputEndDate2.value = "";
       }
-    }
-    else if (value.length === 0) {
+    } else if (value.length === 0) {
       endDate2.value = null;
     }
   }
@@ -1497,8 +1489,7 @@ watch(
       } else {
         dateOrderInput.value = "";
       }
-    }
-    else if (value.length === 0) {
+    } else if (value.length === 0) {
       dateOrder.value = null;
     }
   }
@@ -1509,8 +1500,7 @@ watch(
     if (value.length === 4) {
       const dateVal = Number(value) - 543;
       startDate.value = dateVal;
-    }
-    else if (value.length === 0) {
+    } else if (value.length === 0) {
       startDate.value = 0;
     }
   }
@@ -1521,8 +1511,7 @@ watch(
     if (value.length === 4) {
       const dateVal = Number(value) - 543;
       endDate.value = dateVal;
-    }
-    else if (value.length === 0) {
+    } else if (value.length === 0) {
       endDate.value = 0;
     }
   }
@@ -1534,8 +1523,7 @@ watch(
     if (value.length === 4) {
       const dateVal = Number(value) - 543;
       yearly.value = dateVal;
-    } 
-    else if (value.length === 0) {
+    } else if (value.length === 0) {
       yearly.value = 0;
     }
   }
diff --git a/src/modules/04_registry/components/Work.vue b/src/modules/04_registry/components/Work.vue
index a6cebc5f8..92c96b7f2 100644
--- a/src/modules/04_registry/components/Work.vue
+++ b/src/modules/04_registry/components/Work.vue
@@ -97,7 +97,6 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(dateStart)"
                     :rules="[(val) => !!val || `${'กรุณาเลือกวันที่เริ่มต้น'}`]"
@@ -154,7 +153,6 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(dateEnd)"
                     :rules="[(val) => !!val || `${'กรุณาเลือกวันที่สิ้นสุด'}`]"
@@ -264,7 +262,6 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="
                       refCommandDate == null ? null : date2Thai(refCommandDate as Date)
diff --git a/src/modules/04_registry/components/salaryNew/SalaryEmployee.vue b/src/modules/04_registry/components/salaryNew/SalaryEmployee.vue
index c39476167..5421345db 100644
--- a/src/modules/04_registry/components/salaryNew/SalaryEmployee.vue
+++ b/src/modules/04_registry/components/salaryNew/SalaryEmployee.vue
@@ -142,7 +142,7 @@
                             :class="getClass(edit)"
                             :outlined="edit"
                             dense
-                            lazy-rules
+                            
                             :borderless="!edit"
                             :model-value="date2Thai(date)"
                             :rules="[
diff --git a/src/modules/04_registry/components/salaryNew/SalaryEmployeeTemp.vue b/src/modules/04_registry/components/salaryNew/SalaryEmployeeTemp.vue
index 6507285cb..e42a38998 100644
--- a/src/modules/04_registry/components/salaryNew/SalaryEmployeeTemp.vue
+++ b/src/modules/04_registry/components/salaryNew/SalaryEmployeeTemp.vue
@@ -142,7 +142,6 @@
                             :class="getClass(edit)"
                             :outlined="edit"
                             dense
-                            lazy-rules
                             :borderless="!edit"
                             :model-value="date2Thai(date)"
                             :rules="[
@@ -506,7 +505,7 @@
       </q-form>
     </q-card>
   </q-dialog>
-  
+
   <HistoryTable
     :rows="rowsHistory"
     :columns="columnsHistory"
@@ -1446,7 +1445,7 @@ const nodeTree = async () => {
       messageError($q, e);
     })
     .finally(() => {
-      store.isLoad++
+      store.isLoad++;
     });
 };
 
@@ -1568,7 +1567,7 @@ const fetchData = async () => {
             refCommandNo: e.refCommandNo,
             createdFullName: e.createdFullName,
             createdAt: new Date(e.createdAt),
-            salaryStatus: null
+            salaryStatus: null,
           });
         });
       })
@@ -1576,7 +1575,7 @@ const fetchData = async () => {
         messageError($q, e);
       })
       .finally(() => {
-        store.isLoad++
+        store.isLoad++;
       });
   }
 };
@@ -2067,7 +2066,7 @@ const clickHistory = async (row: RequestItemsEmployee) => {
           refCommandNo: e.refCommandNo,
           createdFullName: e.createdFullName,
           createdAt: new Date(e.createdAt),
-          salaryStatus: null
+          salaryStatus: null,
         });
       });
     })
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 652d0f54e..1499646c9 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
@@ -549,136 +549,135 @@ onMounted(async () => {
         <q-separator color="grey-4" />
 
         <q-card-section style="max-height: 55vh" class="scroll">
-            <div class="row q-gutter-sm q-pb-sm">
-              <div class="col">
-                <q-input
-                  outlined
-                  v-model="profesLicenseData.certificateType"
-                  label="ชื่อใบอนุญาต"
-                  bg-color="white"
-                  dense
-                  class="inputgreen"
-                  :rules="[(val) => !!val || `${'กรุณากรอกชื่อใบอนุญาต'}`]"
-                  hide-bottom-space
-                />
-              </div>
-              <div class="col">
-                <q-input
-                  outlined
-                  v-model="profesLicenseData.issuer"
-                  label="หน่วยงานผู้ออกใบอนุญาต"
-                  bg-color="white"
-                  dense
-                  class="inputgreen"
-                  :rules="[
-                    (val) => !!val || `${'กรุณากรอกหน่วยงานผู้ออกใบอนุญาต'}`,
-                  ]"
-                  hide-bottom-space
-                />
-              </div>
+          <div class="row q-gutter-sm q-pb-sm">
+            <div class="col">
+              <q-input
+                outlined
+                v-model="profesLicenseData.certificateType"
+                label="ชื่อใบอนุญาต"
+                bg-color="white"
+                dense
+                class="inputgreen"
+                :rules="[(val) => !!val || `${'กรุณากรอกชื่อใบอนุญาต'}`]"
+                hide-bottom-space
+              />
             </div>
-            <div class="row q-gutter-sm q-pb-sm">
-              <div class="col">
-                <q-input
-                  outlined
-                  v-model="profesLicenseData.certificateNo"
-                  label="เลขที่ใบอนุญาต"
-                  bg-color="white"
-                  class="inputgreen"
-                  dense
-                  :rules="[(val) => !!val || `${'กรุณากรอกเลขที่ใบอนุญาต'}`]"
-                  hide-bottom-space
-                />
-              </div>
-              <div class="col">
-                <datepicker
-                  menu-class-name="modalfix"
-                  v-model="profesLicenseData.issueDate"
-                  :locale="'th'"
-                  autoApply
-                  class="col"
-                  :enableTimePicker="false"
-                  @update:modelValue="profesLicenseData.issueDate"
-                >
-                  <template #year="{ year }">{{ year + 543 }}</template>
-                  <template #year-overlay-value="{ value }">{{
-                    parseInt(value + 543)
-                  }}</template>
-                  <template #trigger>
-                    <q-input
-                      dense
-                      lazy-rules
-                      class="inputgreen"
-                      outlined
-                      bg-color="white"
-                      hide-bottom-space
-                      :model-value="
-                        profesLicenseData.issueDate
-                          ? date2Thai(profesLicenseData.issueDate)
-                          : ''
-                      "
-                      :rules="[
-                        (val) => !!val || `${'กรุณาเลือกวันที่ออกใบอนุญาต'}`,
-                      ]"
-                      :label="`${'วันที่ออกใบอนุญาต'}`"
-                    >
-                      <template v-slot:prepend>
-                        <q-icon
-                          name="event"
-                          class="cursor-pointer"
-                          style="color: var(--q-primary)"
-                        >
-                        </q-icon>
-                      </template>
-                    </q-input>
-                  </template>
-                </datepicker>
-              </div>
+            <div class="col">
+              <q-input
+                outlined
+                v-model="profesLicenseData.issuer"
+                label="หน่วยงานผู้ออกใบอนุญาต"
+                bg-color="white"
+                dense
+                class="inputgreen"
+                :rules="[
+                  (val) => !!val || `${'กรุณากรอกหน่วยงานผู้ออกใบอนุญาต'}`,
+                ]"
+                hide-bottom-space
+              />
             </div>
-            <div class="row q-gutter-sm q-pb-sm">
-              <div class="col">
-                <datepicker
-                  menu-class-name="modalfix"
-                  v-model="profesLicenseData.expireDate"
-                  :locale="'th'"
-                  autoApply
-                  :enableTimePicker="false"
-                  @update:modelValue="profesLicenseData.expireDate"
-                >
-                  <template #year="{ year }">{{ year + 543 }}</template>
-                  <template #year-overlay-value="{ value }">{{
-                    parseInt(value + 543)
-                  }}</template>
-                  <template #trigger>
-                    <q-input
-                      dense
-                      outlined
-                      bg-color="white"
-                      class="inputgreen"
-                      clearable
-                      @clear="() => (profesLicenseData.expireDate = null)"
-                      hide-bottom-space
-                      :model-value="
-                        profesLicenseData.expireDate
-                          ? date2Thai(profesLicenseData.expireDate)
-                          : ''
-                      "
-                      :label="`${'วันที่หมดอายุ'}`"
-                      @update:modelValue="profesLicenseData.expireDate = null"
-                    >
-                      <template v-slot:prepend>
-                        <q-icon
-                          name="event"
-                          class="cursor-pointer"
-                          style="color: var(--q-primary)"
-                        >
-                        </q-icon>
-                      </template>
-                    </q-input>
-                  </template>
-                </datepicker>
-              </div>
+          </div>
+          <div class="row q-gutter-sm q-pb-sm">
+            <div class="col">
+              <q-input
+                outlined
+                v-model="profesLicenseData.certificateNo"
+                label="เลขที่ใบอนุญาต"
+                bg-color="white"
+                class="inputgreen"
+                dense
+                :rules="[(val) => !!val || `${'กรุณากรอกเลขที่ใบอนุญาต'}`]"
+                hide-bottom-space
+              />
             </div>
+            <div class="col">
+              <datepicker
+                menu-class-name="modalfix"
+                v-model="profesLicenseData.issueDate"
+                :locale="'th'"
+                autoApply
+                class="col"
+                :enableTimePicker="false"
+                @update:modelValue="profesLicenseData.issueDate"
+              >
+                <template #year="{ year }">{{ year + 543 }}</template>
+                <template #year-overlay-value="{ value }">{{
+                  parseInt(value + 543)
+                }}</template>
+                <template #trigger>
+                  <q-input
+                    dense
+                    class="inputgreen"
+                    outlined
+                    bg-color="white"
+                    hide-bottom-space
+                    :model-value="
+                      profesLicenseData.issueDate
+                        ? date2Thai(profesLicenseData.issueDate)
+                        : ''
+                    "
+                    :rules="[
+                      (val) => !!val || `${'กรุณาเลือกวันที่ออกใบอนุญาต'}`,
+                    ]"
+                    :label="`${'วันที่ออกใบอนุญาต'}`"
+                  >
+                    <template v-slot:prepend>
+                      <q-icon
+                        name="event"
+                        class="cursor-pointer"
+                        style="color: var(--q-primary)"
+                      >
+                      </q-icon>
+                    </template>
+                  </q-input>
+                </template>
+              </datepicker>
+            </div>
+          </div>
+          <div class="row q-gutter-sm q-pb-sm">
+            <div class="col">
+              <datepicker
+                menu-class-name="modalfix"
+                v-model="profesLicenseData.expireDate"
+                :locale="'th'"
+                autoApply
+                :enableTimePicker="false"
+                @update:modelValue="profesLicenseData.expireDate"
+              >
+                <template #year="{ year }">{{ year + 543 }}</template>
+                <template #year-overlay-value="{ value }">{{
+                  parseInt(value + 543)
+                }}</template>
+                <template #trigger>
+                  <q-input
+                    dense
+                    outlined
+                    bg-color="white"
+                    class="inputgreen"
+                    clearable
+                    @clear="() => (profesLicenseData.expireDate = null)"
+                    hide-bottom-space
+                    :model-value="
+                      profesLicenseData.expireDate
+                        ? date2Thai(profesLicenseData.expireDate)
+                        : ''
+                    "
+                    :label="`${'วันที่หมดอายุ'}`"
+                    @update:modelValue="profesLicenseData.expireDate = null"
+                  >
+                    <template v-slot:prepend>
+                      <q-icon
+                        name="event"
+                        class="cursor-pointer"
+                        style="color: var(--q-primary)"
+                      >
+                      </q-icon>
+                    </template>
+                  </q-input>
+                </template>
+              </datepicker>
+            </div>
+          </div>
         </q-card-section>
         <q-separator color="grey-4" />
         <q-card-actions align="right">
@@ -708,68 +707,68 @@ onMounted(async () => {
 
       <q-card-section style="max-height: 60vh" class="scroll">
         <div class="row q-gutter-sm q-mb-sm">
-            <q-space />
-            <q-input
-              dense
-              outlined
-              bg-color="white"
-              v-model="historyKeyword"
-              label="ค้นหา"
-            >
-              <template v-slot:append>
-                <q-icon name="search" />
-              </template>
-            </q-input>
-
-            <q-select
-              v-model="historyVisibleColumns"
-              multiple
-              outlined
-              dense
-              bg-color="white"
-              options-dense
-              :display-value="$q.lang.table.columns"
-              emit-value
-              map-options
-              :options="historyColumns"
-              option-value="name"
-              options-cover
-              style="min-width: 150px"
-            />
-          </div>
-          <d-table
-            ref="table"
-            :columns="historyColumns"
-            :rows="historyRows"
-            row-key="name"
-            flat
-            :filter="historyKeyword"
-            v-model:pagination="historyPagination"
-            bordered
-            :paging="true"
+          <q-space />
+          <q-input
             dense
-            :rows-per-page-options="[20, 50, 100]"
-            class="custom-header-table"
-            :visible-columns="historyVisibleColumns"
+            outlined
+            bg-color="white"
+            v-model="historyKeyword"
+            label="ค้นหา"
           >
-            <template v-slot:header="props">
-              <q-tr :props="props">
-                <q-th v-for="col in props.cols" :key="col.name" :props="props">
-                  <span class="text-weight-medium">{{ col.label }}</span>
-                </q-th>
-                <q-th auto-width />
-              </q-tr>
+            <template v-slot:append>
+              <q-icon name="search" />
             </template>
-            <template v-slot:body="props">
-              <q-tr :props="props" class="cursor-pointer">
-                <q-td v-for="col in props.cols" :key="col.id">
-                  <div>
-                    {{ col.value ? col.value : "-" }}
-                  </div>
-                </q-td>
-              </q-tr>
-            </template>
-          </d-table>
+          </q-input>
+
+          <q-select
+            v-model="historyVisibleColumns"
+            multiple
+            outlined
+            dense
+            bg-color="white"
+            options-dense
+            :display-value="$q.lang.table.columns"
+            emit-value
+            map-options
+            :options="historyColumns"
+            option-value="name"
+            options-cover
+            style="min-width: 150px"
+          />
+        </div>
+        <d-table
+          ref="table"
+          :columns="historyColumns"
+          :rows="historyRows"
+          row-key="name"
+          flat
+          :filter="historyKeyword"
+          v-model:pagination="historyPagination"
+          bordered
+          :paging="true"
+          dense
+          :rows-per-page-options="[20, 50, 100]"
+          class="custom-header-table"
+          :visible-columns="historyVisibleColumns"
+        >
+          <template v-slot:header="props">
+            <q-tr :props="props">
+              <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                <span class="text-weight-medium">{{ col.label }}</span>
+              </q-th>
+              <q-th auto-width />
+            </q-tr>
+          </template>
+          <template v-slot:body="props">
+            <q-tr :props="props" class="cursor-pointer">
+              <q-td v-for="col in props.cols" :key="col.id">
+                <div>
+                  {{ col.value ? col.value : "-" }}
+                </div>
+              </q-td>
+            </q-tr>
+          </template>
+        </d-table>
       </q-card-section>
     </q-card>
   </q-dialog>
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 c83a10e3f..99e3e9b20 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
@@ -728,11 +728,7 @@ onMounted(async () => {
               />
             </div>
           </div>
-          <q-card
-            flat
-            bordered
-            class="q-px-sm q-my-sm q-pb-sm borderCard"
-          >
+          <q-card flat bordered class="q-px-sm q-my-sm q-pb-sm borderCard">
             <div class="row col-12 q-gutter-md q-py-sm text-grey-7">
               <q-radio
                 v-model="isDate"
@@ -774,7 +770,6 @@ onMounted(async () => {
                   <template #trigger>
                     <q-input
                       dense
-                      lazy-rules
                       outlined
                       class="inputgreen"
                       hide-bottom-space
@@ -820,7 +815,6 @@ onMounted(async () => {
                   <template #trigger>
                     <q-input
                       dense
-                      lazy-rules
                       class="inputgreen"
                       outlined
                       hide-bottom-space
@@ -868,7 +862,6 @@ onMounted(async () => {
                     <q-input
                       outlined
                       dense
-                      lazy-rules
                       class="inputgreen"
                       :model-value="date2Thai(trainData.startDate)"
                       :rules="[
@@ -914,7 +907,6 @@ onMounted(async () => {
                     <q-input
                       outlined
                       dense
-                      lazy-rules
                       class="inputgreen"
                       :model-value="date2Thai(trainData.endDate)"
                       :rules="[
@@ -956,7 +948,6 @@ onMounted(async () => {
                 <template #trigger>
                   <q-input
                     dense
-                    lazy-rules
                     outlined
                     class="inputgreen"
                     clearable
@@ -1046,7 +1037,6 @@ onMounted(async () => {
                     outlined
                     dense
                     class="inputgreen"
-                    lazy-rules
                     clearable
                     @clear="() => (trainData.dateOrder = null)"
                     @update:modelValue="trainData.dateOrder = null"
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 1a494efde..0252a1a08 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
@@ -1003,11 +1003,7 @@ onMounted(async () => {
               />
             </div>
           </div>
-          <q-card
-            flat
-            bordered
-            class="q-px-md q-pb-md q-my-sm borderCard"
-          >
+          <q-card flat bordered class="q-px-md q-pb-md q-my-sm borderCard">
             <div class="row col-12 q-gutter-md q-py-sm text-grey-7">
               <q-radio
                 v-model="isDate"
@@ -1095,7 +1091,6 @@ onMounted(async () => {
                     <q-input
                       dense
                       class="inputgreen"
-                      lazy-rules
                       outlined
                       hide-bottom-space
                       :model-value="educationData.endYear + 543"
@@ -1142,11 +1137,9 @@ onMounted(async () => {
                       outlined
                       class="inputgreen"
                       dense
-                      lazy-rules
                       :model-value="date2Thai(educationData.startDate)"
                       :rules="[
-                        (val) =>
-                          !!val || `${'กรุณาเลือกวันที่เริ่มต้นศึกษา'}`,
+                        (val) => !!val || `${'กรุณาเลือกวันที่เริ่มต้นศึกษา'}`,
                       ]"
                       hide-bottom-space
                       :label="`${'วันที่เริ่มต้นศึกษา'}`"
@@ -1187,7 +1180,6 @@ onMounted(async () => {
                       outlined
                       dense
                       class="inputgreen"
-                      lazy-rules
                       :model-value="date2Thai(educationData.endDate)"
                       :rules="[
                         (val) => !!val || `${'กรุณาเลือกวันที่จบการศึกษา'}`,
@@ -1229,7 +1221,6 @@ onMounted(async () => {
                     bg-color="white"
                     dense
                     class="inputgreen"
-                    lazy-rules
                     :model-value="date2Thai(educationData.finishDate)"
                     :rules="[
                       (val) => !!val || `${'กรุณาเลือกวันที่สำเร็จการศึกษา'}`,
@@ -1389,19 +1380,19 @@ onMounted(async () => {
         </q-card-section>
         <q-separator />
 
-        <q-card-actions align="right">      
-            <q-btn
-              id="onSubmit"
-              type="submit"
-              dense
-              unelevated
-              label="บันทึก"
-              color="public"
-              class="q-px-md"
-            >
-              <q-tooltip>บันทึกข้อมูล</q-tooltip>
-            </q-btn>
-         </q-card-actions>
+        <q-card-actions align="right">
+          <q-btn
+            id="onSubmit"
+            type="submit"
+            dense
+            unelevated
+            label="บันทึก"
+            color="public"
+            class="q-px-md"
+          >
+            <q-tooltip>บันทึกข้อมูล</q-tooltip>
+          </q-btn>
+        </q-card-actions>
       </q-form>
     </q-card>
   </q-dialog>
@@ -1415,71 +1406,71 @@ onMounted(async () => {
       <q-separator />
 
       <q-card-section style="max-height: 50vh" class="scroll">
-          <q-toolbar style="padding: 0px" class="text-primary q-mb-sm">
-            <q-space />
-            <q-input
-              dense
-              outlined
-              bg-color="white"
-              v-model="historyKeyword"
-              label="ค้นหา"
-              class="q-mr-sm"
-            >
-              <template v-slot:append>
-                <q-icon name="search" />
-              </template>
-            </q-input>
-
-            <q-select
-              v-model="historyVisibleColumns"
-              multiple
-              outlined
-              dense
-              bg-color="white"
-              options-dense
-              :display-value="$q.lang.table.columns"
-              emit-value
-              map-options
-              :options="historyColumns"
-              option-value="name"
-              options-cover
-              style="min-width: 150px"
-            />
-          </q-toolbar>
-          <d-table
-            ref="table"
-            :columns="historyColumns"
-            :rows="historyRows"
-            row-key="name"
-            flat
-            bordered
-            :paging="true"
+        <q-toolbar style="padding: 0px" class="text-primary q-mb-sm">
+          <q-space />
+          <q-input
             dense
-            :filter="historyKeyword"
-            v-model:pagination="historyPagination"
-            :rows-per-page-options="[20, 50, 100]"
-            class="custom-header-table"
-            :visible-columns="historyVisibleColumns"
+            outlined
+            bg-color="white"
+            v-model="historyKeyword"
+            label="ค้นหา"
+            class="q-mr-sm"
           >
-            <template v-slot:header="props">
-              <q-tr :props="props">
-                <q-th v-for="col in props.cols" :key="col.name" :props="props">
-                  <span class="text-weight-medium">{{ col.label }}</span>
-                </q-th>
-                <q-th auto-width />
-              </q-tr>
+            <template v-slot:append>
+              <q-icon name="search" />
             </template>
-            <template v-slot:body="props">
-              <q-tr :props="props" class="cursor-pointer">
-                <q-td v-for="col in props.cols" :key="col.id">
-                  <div>
-                    {{ col.value === "" ? "-" : col.value }}
-                  </div>
-                </q-td>
-                <q-td auto-width> </q-td>
-              </q-tr>
-            </template>
-          </d-table>
+          </q-input>
+
+          <q-select
+            v-model="historyVisibleColumns"
+            multiple
+            outlined
+            dense
+            bg-color="white"
+            options-dense
+            :display-value="$q.lang.table.columns"
+            emit-value
+            map-options
+            :options="historyColumns"
+            option-value="name"
+            options-cover
+            style="min-width: 150px"
+          />
+        </q-toolbar>
+        <d-table
+          ref="table"
+          :columns="historyColumns"
+          :rows="historyRows"
+          row-key="name"
+          flat
+          bordered
+          :paging="true"
+          dense
+          :filter="historyKeyword"
+          v-model:pagination="historyPagination"
+          :rows-per-page-options="[20, 50, 100]"
+          class="custom-header-table"
+          :visible-columns="historyVisibleColumns"
+        >
+          <template v-slot:header="props">
+            <q-tr :props="props">
+              <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                <span class="text-weight-medium">{{ col.label }}</span>
+              </q-th>
+              <q-th auto-width />
+            </q-tr>
+          </template>
+          <template v-slot:body="props">
+            <q-tr :props="props" class="cursor-pointer">
+              <q-td v-for="col in props.cols" :key="col.id">
+                <div>
+                  {{ col.value === "" ? "-" : col.value }}
+                </div>
+              </q-td>
+              <q-td auto-width> </q-td>
+            </q-tr>
+          </template>
+        </d-table>
       </q-card-section>
     </q-card>
   </q-dialog>
diff --git a/src/modules/05_placement/components/AppointEmployee/Detail.vue b/src/modules/05_placement/components/AppointEmployee/Detail.vue
index f3c5954e3..64b07c6b3 100644
--- a/src/modules/05_placement/components/AppointEmployee/Detail.vue
+++ b/src/modules/05_placement/components/AppointEmployee/Detail.vue
@@ -1,4 +1,3 @@
-
 <script setup lang="ts">
 import { onMounted, ref } from "vue";
 import { useQuasar } from "quasar";
@@ -14,7 +13,7 @@ import type { QForm } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
-  
+
 const modalPersonal = ref<boolean>(false);
 const personId = ref<string>("");
 const $q = useQuasar();
@@ -68,8 +67,9 @@ const fecthappointmentByid = async () => {
       const data = res.data.result;
       appointment.value = data;
       profileId.value = data.profileId;
-      title.value.fullname = `${data.prefix}${data.firstname ?? "-"} ${data.lastname ?? "-"
-        }`;
+      title.value.fullname = `${data.prefix}${data.firstname ?? "-"} ${
+        data.lastname ?? "-"
+      }`;
       title.value.organizationPositionOld = data.organizationPositionOld ?? "-";
       title.value.positionLevelOld = data.positionLevelOld ?? "-";
       title.value.positionTypeOld = data.positionTypeOld ?? "-";
@@ -164,8 +164,16 @@ onMounted(async () => {
 </script>
 <template>
   <div class="toptitle text-dark col-12 row items-center">
-    <q-btn icon="mdi-arrow-left" unelevated round dense flat color="primary" class="q-mr-sm"
-      @click="router.push(`/appoint-employee`)" />
+    <q-btn
+      icon="mdi-arrow-left"
+      unelevated
+      round
+      dense
+      flat
+      color="primary"
+      class="q-mr-sm"
+      @click="router.push(`/appoint-employee`)"
+    />
     รายละเอียดการปรับระดับชั้นงานลูกจ้าง {{ title.fullname }}
   </div>
   <q-card bordered class="row col-12 text-dark">
@@ -174,8 +182,15 @@ onMounted(async () => {
         {{ title.fullname }}
       </div>
       <q-space />
-      <q-btn outline color="blue" dense icon-right="mdi-open-in-new" class="q-px-sm" label="ดูข้อมูลทะเบียนประวัติ"
-        @click="onclickViewinfo(profileId)" />
+      <q-btn
+        outline
+        color="blue"
+        dense
+        icon-right="mdi-open-in-new"
+        class="q-px-sm"
+        label="ดูข้อมูลทะเบียนประวัติ"
+        @click="onclickViewinfo(profileId)"
+      />
     </div>
     <div class="col-12"><q-separator /></div>
     <div class="row col-12 q-pa-md">
@@ -220,12 +235,36 @@ onMounted(async () => {
       <q-space />
       <div v-if="status !== 'DONE' && status !== 'REPORT'">
         <div class="q-gutter-sm" v-if="!edit">
-          <q-btn outline color="primary" dense icon-right="mdi-file-edit-outline" class="q-px-sm" label="แก้ไข"
-            style="width: 80px" @click="edit = !edit" />
+          <q-btn
+            outline
+            color="primary"
+            dense
+            icon-right="mdi-file-edit-outline"
+            class="q-px-sm"
+            label="แก้ไข"
+            style="width: 80px"
+            @click="edit = !edit"
+          />
         </div>
         <div class="q-gutter-sm" v-else>
-          <q-btn outline color="public" dense class="q-px-sm" label="บันทึก" style="width: 80px" @click="clickSave" />
-          <q-btn outline color="red" dense class="q-px-sm" label="ยกเลิก" style="width: 80px" @click="cancel()" />
+          <q-btn
+            outline
+            color="public"
+            dense
+            class="q-px-sm"
+            label="บันทึก"
+            style="width: 80px"
+            @click="clickSave"
+          />
+          <q-btn
+            outline
+            color="red"
+            dense
+            class="q-px-sm"
+            label="ยกเลิก"
+            style="width: 80px"
+            @click="cancel()"
+          />
         </div>
       </div>
     </div>
@@ -236,9 +275,19 @@ onMounted(async () => {
           <div class="text-weight-bold">วุฒิการศึกษา</div>
         </div>
         <div class="col-12">
-          <q-input :class="getClass(edit)" :outlined="edit" dense lazy-rules :readonly="!edit" :borderless="!edit"
-            v-model="educationOld" :rules="[(val) => !!val || `${'กรุณากรอกวุฒิการศึกษา'}`]" hide-bottom-space
-            :label="`${'วุฒิการศึกษา'}`" type="text" />
+          <q-input
+            :class="getClass(edit)"
+            :outlined="edit"
+            dense
+            lazy-rules
+            :readonly="!edit"
+            :borderless="!edit"
+            v-model="educationOld"
+            :rules="[(val) => !!val || `${'กรุณากรอกวุฒิการศึกษา'}`]"
+            hide-bottom-space
+            :label="`${'วุฒิการศึกษา'}`"
+            type="text"
+          />
         </div>
       </div>
       <div class="row col-12 q-pa-md">
@@ -249,58 +298,119 @@ onMounted(async () => {
             </div>
 
             <div class="col-12">
-              <q-input :class="getClass(edit)" :outlined="edit" dense lazy-rules :readonly="!edit" :borderless="!edit"
-                v-model="organizationPositionOld" :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่ง/สังกัด'}`]"
-                hide-bottom-space :label="`${'ตำแหน่ง/สังกัด'}`" type="textarea" />
+              <q-input
+                :class="getClass(edit)"
+                :outlined="edit"
+                dense
+                lazy-rules
+                :readonly="!edit"
+                :borderless="!edit"
+                v-model="organizationPositionOld"
+                :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่ง/สังกัด'}`]"
+                hide-bottom-space
+                :label="`${'ตำแหน่ง/สังกัด'}`"
+                type="textarea"
+              />
             </div>
           </div>
 
           <div class="col-xs-6 col-sm-3 row">
             <div class="col-12">
-              <q-input :class="getClass(edit)" :outlined="edit" dense lazy-rules :readonly="!edit" :borderless="!edit"
-                v-model="positionTypeOld" :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]" hide-bottom-space
-                :label="`${'ตำแหน่งประเภท'}`" />
+              <q-input
+                :class="getClass(edit)"
+                :outlined="edit"
+                dense
+                lazy-rules
+                :readonly="!edit"
+                :borderless="!edit"
+                v-model="positionTypeOld"
+                :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]"
+                hide-bottom-space
+                :label="`${'ตำแหน่งประเภท'}`"
+              />
             </div>
           </div>
           <div class="col-xs-6 col-sm-3 row">
             <div class="col-12">
-              <q-input :class="getClass(edit)" :outlined="edit" dense lazy-rules :readonly="!edit" :borderless="!edit"
-                v-model="positionLevelOld" :rules="[(val) => !!val || `${'กรุณากรอกระดับ'}`]" hide-bottom-space
-                :label="`${'ระดับ'}`" />
+              <q-input
+                :class="getClass(edit)"
+                :outlined="edit"
+                dense
+                lazy-rules
+                :readonly="!edit"
+                :borderless="!edit"
+                v-model="positionLevelOld"
+                :rules="[(val) => !!val || `${'กรุณากรอกระดับ'}`]"
+                hide-bottom-space
+                :label="`${'ระดับ'}`"
+              />
             </div>
           </div>
           <div class="col-xs-6 col-sm-3 row">
             <div class="col-12">
-              <q-input :class="getClass(edit)" :outlined="edit" dense lazy-rules :readonly="!edit" :borderless="!edit"
-                v-model="posNo" :rules="[(val) => !!val || `${'กรุณากรอกเลขที่'}`]" hide-bottom-space
-                :label="`${'เลขที่'}`" />
+              <q-input
+                :class="getClass(edit)"
+                :outlined="edit"
+                dense
+                lazy-rules
+                :readonly="!edit"
+                :borderless="!edit"
+                v-model="posNo"
+                :rules="[(val) => !!val || `${'กรุณากรอกเลขที่'}`]"
+                hide-bottom-space
+                :label="`${'เลขที่'}`"
+              />
             </div>
           </div>
           <div class="col-xs-6 col-sm-3 row">
             <div class="col-12">
-              <CurrencyInput v-model="salary" label="เงินเดือน" :edit="edit"
-                :rules="[(val: number) => !!val || `${'กรุณากรอกเงินเดือน'}`]" lazy-rules />
+              <CurrencyInput
+                v-model="salary"
+                label="เงินเดือน"
+                :edit="edit"
+                :rules="[(val: number) => !!val || `${'กรุณากรอกเงินเดือน'}`]"
+                lazy-rules
+              />
             </div>
           </div>
           <div class="col-12"><q-separator /></div>
           <div class="col-xs-6 col-sm-6 row items-center">
             <div class="col-12">
-              <datepicker menu-class-name="modalfix" :readonly="!edit" v-model="date" :locale="'th'" autoApply
-                :enableTimePicker="false" week-start="0">
+              <datepicker
+                menu-class-name="modalfix"
+                :readonly="!edit"
+                v-model="date"
+                :locale="'th'"
+                autoApply
+                :enableTimePicker="false"
+                week-start="0"
+              >
                 <template #year="{ year }">{{ year + 543 }}</template>
                 <template #year-overlay-value="{ value }">{{
                   parseInt(value + 543)
                 }}</template>
                 <template #trigger>
-                  <q-input :class="getClass(edit)" :outlined="edit" dense lazy-rules :borderless="!edit" :readonly="!edit"
+                  <q-input
+                    :class="getClass(edit)"
+                    :outlined="edit"
+                    dense
+                    :borderless="!edit"
+                    :readonly="!edit"
                     :model-value="date !== null ? date2Thai(date) : null"
-                    :rules="[(val) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`]" hide-bottom-space
-                    :label="`${'ดำรงตำแหน่งในระดับปัจจุบันเมื่อ'}`">
+                    :rules="[(val) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`]"
+                    hide-bottom-space
+                    :label="`${'ดำรงตำแหน่งในระดับปัจจุบันเมื่อ'}`"
+                  >
                     <template v-slot:prepend>
-                      <q-icon name="event" class="cursor-pointer" :style="edit
-                          ? 'color: var(--q-primary)'
-                          : 'color: var(--q-grey)'
-                        ">
+                      <q-icon
+                        name="event"
+                        class="cursor-pointer"
+                        :style="
+                          edit
+                            ? 'color: var(--q-primary)'
+                            : 'color: var(--q-grey)'
+                        "
+                      >
                       </q-icon>
                     </template>
                   </q-input>
@@ -309,8 +419,18 @@ onMounted(async () => {
             </div>
           </div>
           <div class="col-12">
-            <q-input :class="getClass(edit)" :outlined="edit" dense lazy-rules :readonly="!edit" :borderless="!edit"
-              v-model="reason" hide-bottom-space :label="`${'หมายเหตุ '}`" type="textarea" />
+            <q-input
+              :class="getClass(edit)"
+              :outlined="edit"
+              dense
+              lazy-rules
+              :readonly="!edit"
+              :borderless="!edit"
+              v-model="reason"
+              hide-bottom-space
+              :label="`${'หมายเหตุ '}`"
+              type="textarea"
+            />
           </div>
         </div>
       </div>
diff --git a/src/modules/05_placement/components/AppointEmployee/Modal.vue b/src/modules/05_placement/components/AppointEmployee/Modal.vue
index b7cc4ce2c..ae6d9330f 100644
--- a/src/modules/05_placement/components/AppointEmployee/Modal.vue
+++ b/src/modules/05_placement/components/AppointEmployee/Modal.vue
@@ -9,7 +9,14 @@ import config from "@/app.config";
 
 const $q = useQuasar();
 const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
-const { date2Thai, hideLoader, messageError, showLoader, success, dialogConfirm } = mixin; //ฟังก์ชันกลางที่เรียกใช้
+const {
+  date2Thai,
+  hideLoader,
+  messageError,
+  showLoader,
+  success,
+  dialogConfirm,
+} = mixin; //ฟังก์ชันกลางที่เรียกใช้
 
 const notFound = ref<string>("ไม่พบข้อมูลที่ค้นหา");
 const noData = ref<string>("ไม่พบข้อมูลผังโครงสร้าง");
@@ -115,15 +122,18 @@ const myFilterMethod = (node: any, filter: string) => {
     (node.organizationName && node.organizationName.indexOf(filt) > -1) ||
     (node.positionNum && node.positionNum.indexOf(filt) > -1) ||
     (node.positionName && node.positionName.indexOf(filt) > -1) ||
-    (node.governmentCode && node.governmentCode.toString().indexOf(filt) > -1) ||
+    (node.governmentCode &&
+      node.governmentCode.toString().indexOf(filt) > -1) ||
     (node.agency && node.agency.indexOf(filt) > -1) ||
     (node.government && node.government.indexOf(filt) > -1) ||
     (node.department && node.department.indexOf(filt) > -1) ||
     (node.pile && node.pile.indexOf(filt) > -1) ||
-    (node.organizationShortName && node.organizationShortName.indexOf(filt) > -1) ||
+    (node.organizationShortName &&
+      node.organizationShortName.indexOf(filt) > -1) ||
     (node.positionSideName && node.positionSideName.indexOf(filt) > -1) ||
     (node.executivePosition && node.executivePosition.indexOf(filt) > -1) ||
-    (node.executivePositionSide && node.executivePositionSide.indexOf(filt) > -1) ||
+    (node.executivePositionSide &&
+      node.executivePositionSide.indexOf(filt) > -1) ||
     (node.positionLevel && node.positionLevel.indexOf(filt) > -1)
   );
 };
@@ -242,7 +252,6 @@ const positionLevelOptions = ref<Object[]>([
 
 const selectedPosition = async (data: any) => {
   if (data.name == null && selected.value != data.keyId) {
-
     editDataStatus.value = true;
     selected.value = data.keyId;
 
@@ -330,7 +339,6 @@ const checkPosition = (val: string) => {
   return num;
 };
 
-
 watch(props, () => {
   expanded.value = [];
   const dataPersonal = props.personal;
@@ -352,7 +360,6 @@ watch(props, () => {
         }
       }
     });
-
   }
 });
 
@@ -389,24 +396,46 @@ function findByPerson(element: any): any {
             <div class="col-xs-12 col-sm-7 row">
               <q-card flat bordered class="fit q-pa-sm">
                 <q-scroll-area visible style="height: 70vh">
-                  <q-input outlined dense ref="filterRef" v-model="search" placeholder="ค้นหา" class="q-mb-sm">
+                  <q-input
+                    outlined
+                    dense
+                    ref="filterRef"
+                    v-model="search"
+                    placeholder="ค้นหา"
+                    class="q-mb-sm"
+                  >
                     <template v-slot:append>
                       <q-icon name="mdi-magnify" />
                     </template>
                   </q-input>
                   <div class="q-pa-sm q-gutter-sm">
-                    <q-tree no-transition dense :nodes="treeData" node-key="keyId" :filter="search"
-                      :no-results-label="notFound" :no-nodes-label="noData" :filter-method="myFilterMethod"
-                      v-model:expanded="expanded">
+                    <q-tree
+                      no-transition
+                      dense
+                      :nodes="treeData"
+                      node-key="keyId"
+                      :filter="search"
+                      :no-results-label="notFound"
+                      :no-nodes-label="noData"
+                      :filter-method="myFilterMethod"
+                      v-model:expanded="expanded"
+                    >
                       <template v-slot:header-organization="prop">
                         <div class="col">
-                          <div class="row items-center q-px-xs q-pt-xs q-gutter-sm">
+                          <div
+                            class="row items-center q-px-xs q-pt-xs q-gutter-sm"
+                          >
                             <!--แสดงชื่อแผนก พิมพ์ตัวหนา คลิกแล้วกาง/หุบ Tree-->
                             <div class="text-weight-medium">
                               {{ prop.node.organizationName }}
                             </div>
-                            <q-badge v-if="prop.node.totalPositionVacant > 0" rounded color="red" outline
-                              :label="prop.node.totalPositionVacant" />
+                            <q-badge
+                              v-if="prop.node.totalPositionVacant > 0"
+                              rounded
+                              color="red"
+                              outline
+                              :label="prop.node.totalPositionVacant"
+                            />
 
                             <q-space />
                           </div>
@@ -420,31 +449,53 @@ function findByPerson(element: any): any {
                       </template>
 
                       <template v-slot:header-person="prop">
-                        <q-item clickable :active="selected == prop.node.keyId" @click="selectedPosition(prop.node)"
-                          :disable="prop.node.name != null ||
+                        <q-item
+                          clickable
+                          :active="selected == prop.node.keyId"
+                          @click="selectedPosition(prop.node)"
+                          :disable="
+                            prop.node.name != null ||
                             checkPosition(prop.node.positionNumId) != -1
-                            " active-class="my-list-link text-primary text-weight-medium"
-                          class="row items-center text-dark q-py-xs q-pl-sm rounded-borders my-list">
-                          <img v-if="prop.node.avatar == '' ||
-                            prop.node.avatar ==
-                            'https://cdn.quasar.dev/img/boy-avatar.png'
-                            " src="@/assets/avatar_user.jpg" class="col-xs-1 col-sm-2" style="
+                          "
+                          active-class="my-list-link text-primary text-weight-medium"
+                          class="row items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
+                        >
+                          <img
+                            v-if="
+                              prop.node.avatar == '' ||
+                              prop.node.avatar ==
+                                'https://cdn.quasar.dev/img/boy-avatar.png'
+                            "
+                            src="@/assets/avatar_user.jpg"
+                            class="col-xs-1 col-sm-2"
+                            style="
                               width: 28px;
                               height: 28px;
                               border-radius: 50%;
-                            " />
-                          <img v-else :src="prop.node.avatar" class="col-xs-1 col-sm-2" style="
+                            "
+                          />
+                          <img
+                            v-else
+                            :src="prop.node.avatar"
+                            class="col-xs-1 col-sm-2"
+                            style="
                               width: 28px;
                               height: 28px;
                               border-radius: 50%;
-                            " />
+                            "
+                          />
                           <!--=====ตำแหน่งว่าง สีแดง=====-->
-                          <div v-if="prop.node.name == null" class="q-px-sm text-weight-medium text-red">
+                          <div
+                            v-if="prop.node.name == null"
+                            class="q-px-sm text-weight-medium text-red"
+                          >
                             ว่าง
                           </div>
                           <!--=====หัวหน้า สีเขียว=====-->
                           <div v-else-if="prop.node.positionLeaderFlag">
-                            <div class="q-px-sm text-weight-medium text-primary">
+                            <div
+                              class="q-px-sm text-weight-medium text-primary"
+                            >
                               {{ prop.node.name }}
                             </div>
                           </div>
@@ -464,8 +515,13 @@ function findByPerson(element: any): any {
                           <div class="q-pr-sm">
                             {{ prop.node.positionLevel }}
                           </div>
-                          <q-icon v-if="prop.node.positionLeaderFlag" class="q-mr-sm" size="15px" color="primary"
-                            name="mdi-bookmark"></q-icon>
+                          <q-icon
+                            v-if="prop.node.positionLeaderFlag"
+                            class="q-mr-sm"
+                            size="15px"
+                            color="primary"
+                            name="mdi-bookmark"
+                          ></q-icon>
 
                           <q-space />
                         </q-item>
@@ -481,18 +537,36 @@ function findByPerson(element: any): any {
                   <div class="row col-12 q-col-gutter-xs">
                     <div class="col-xs-12 col-sm-12 col-md-12"></div>
                     <div class="col-xs-12 col-sm-12 col-md-12">
-                      <datepicker menu-class-name="modalfix" v-model="dataForm.containDate" :locale="'th'" autoApply
-                        :enableTimePicker="false" week-start="0">
+                      <datepicker
+                        menu-class-name="modalfix"
+                        v-model="dataForm.containDate"
+                        :locale="'th'"
+                        autoApply
+                        :enableTimePicker="false"
+                        week-start="0"
+                      >
                         <template #year="{ year }">{{ year + 543 }}</template>
                         <template #year-overlay-value="{ value }">{{
                           parseInt(value + 543)
                         }}</template>
                         <template #trigger>
-                          <q-input class="full-width inputgreen cursor-pointer" outlined dense lazy-rules :model-value="date2Thai(new Date(dataForm.containDate))
-                              " :rules="[(val: string) => !!val || `${'วันที่รายงานตัว'}`]"
-                            :label="`${'วันที่รายงานตัว'}`" hide-bottom-space>
+                          <q-input
+                            class="full-width inputgreen cursor-pointer"
+                            outlined
+                            dense
+                            :model-value="
+                              date2Thai(new Date(dataForm.containDate))
+                            "
+                            :rules="[(val: string) => !!val || `${'วันที่รายงานตัว'}`]"
+                            :label="`${'วันที่รายงานตัว'}`"
+                            hide-bottom-space
+                          >
                             <template v-slot:prepend>
-                              <q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)">
+                              <q-icon
+                                name="event"
+                                class="cursor-pointer"
+                                style="color: var(--q-primary)"
+                              >
                               </q-icon>
                             </template>
                           </q-input>
@@ -501,36 +575,92 @@ function findByPerson(element: any): any {
                     </div>
                     <q-space />
                     <div class="col-xs-12 col-sm-12 col-md-12">
-                      <q-select class="full-width inputgreen cursor-pointer custom-input" outlined standout dense
-                        hide-bottom-space lazy-rules :options="posNoOptions" v-model="dataForm.posNoId"
-                        :label="`${'ตำแหน่งเลขที่'}`" map-options />
+                      <q-select
+                        class="full-width inputgreen cursor-pointer custom-input"
+                        outlined
+                        standout
+                        dense
+                        hide-bottom-space
+                        lazy-rules
+                        :options="posNoOptions"
+                        v-model="dataForm.posNoId"
+                        :label="`${'ตำแหน่งเลขที่'}`"
+                        map-options
+                      />
                     </div>
                     <div class="col-xs-12 col-sm-12 col-md-12">
-                      <q-select outlined class="full-width inputgreen cursor-pointer custom-input" standout dense
-                        hide-bottom-space lazy-rules :options="positionOptions" v-model="dataForm.positionId"
-                        :label="`${'ตำแหน่ง'}`" map-options />
+                      <q-select
+                        outlined
+                        class="full-width inputgreen cursor-pointer custom-input"
+                        standout
+                        dense
+                        hide-bottom-space
+                        lazy-rules
+                        :options="positionOptions"
+                        v-model="dataForm.positionId"
+                        :label="`${'ตำแหน่ง'}`"
+                        map-options
+                      />
                     </div>
                     <div class="col-xs-12 col-sm-12 col-md-12">
-                      <q-select outlined class="full-width inputgreen cursor-pointer custom-input" standout dense
-                        hide-bottom-space lazy-rules emit-value :options="positionPathSideOptions"
-                        v-model="dataForm.positionPathSideId" :label="`${'ด้าน/สาขา'}`" map-options />
+                      <q-select
+                        outlined
+                        class="full-width inputgreen cursor-pointer custom-input"
+                        standout
+                        dense
+                        hide-bottom-space
+                        lazy-rules
+                        emit-value
+                        :options="positionPathSideOptions"
+                        v-model="dataForm.positionPathSideId"
+                        :label="`${'ด้าน/สาขา'}`"
+                        map-options
+                      />
                     </div>
 
                     <div class="col-xs-12 col-sm-12 col-md-12">
-                      <q-select outlined class="full-width inputgreen cursor-pointer custom-input" standout dense
-                        hide-bottom-space lazy-rules :options="positionTypeOptions" v-model="dataForm.positionTypeId"
-                        :label="`${'ประเภทตำแหน่ง'}`" map-options />
+                      <q-select
+                        outlined
+                        class="full-width inputgreen cursor-pointer custom-input"
+                        standout
+                        dense
+                        hide-bottom-space
+                        lazy-rules
+                        :options="positionTypeOptions"
+                        v-model="dataForm.positionTypeId"
+                        :label="`${'ประเภทตำแหน่ง'}`"
+                        map-options
+                      />
                     </div>
                     <div class="col-xs-12 col-sm-12 col-md-12">
-                      <q-select outlined class="full-width inputgreen cursor-pointer custom-input" standout dense
-                        hide-bottom-space lazy-rules :options="positionLineOptions" v-model="dataForm.positionLineId"
-                        :label="`${'สายงาน'}`" map-options />
+                      <q-select
+                        outlined
+                        class="full-width inputgreen cursor-pointer custom-input"
+                        standout
+                        dense
+                        hide-bottom-space
+                        lazy-rules
+                        :options="positionLineOptions"
+                        v-model="dataForm.positionLineId"
+                        :label="`${'สายงาน'}`"
+                        map-options
+                      />
                     </div>
                     <div class="col-xs-12 col-sm-12 col-md-12">
-                      <q-select outlined class="full-width inputgreen cursor-pointer custom-input" standout dense
-                        lazy-rules :options="positionLevelOptions" v-model="dataForm.positionLevelId"
-                        :label="`${'ระดับ'}`" hide-bottom-space
-                        :rules="[(val: string) => !!val || `${'กรุณาเลือกระดับ'}`]" emit-value map-options />
+                      <q-select
+                        outlined
+                        class="full-width inputgreen cursor-pointer custom-input"
+                        standout
+                        dense
+                        lazy-rules
+                        :options="positionLevelOptions"
+                        v-model="dataForm.positionLevelId"
+                        :label="`${'ระดับ'}`"
+                        hide-bottom-space
+                        :rules="[(val: string) => !!val || `${'กรุณาเลือกระดับ'}`]"
+                        emit-value
+                        map-options
+                      />
                     </div>
                   </div>
                 </q-scroll-area>
@@ -540,8 +670,12 @@ function findByPerson(element: any): any {
         </q-card-section>
 
         <q-separator />
-        <DialogFooter :editvisible="true" :validate="validateData" :save="saveAppoint"
-          v-model:modalEdit="editDataStatus" />
+        <DialogFooter
+          :editvisible="true"
+          :validate="validateData"
+          :save="saveAppoint"
+          v-model:modalEdit="editDataStatus"
+        />
       </q-form>
     </q-card>
   </q-dialog>
diff --git a/src/modules/05_placement/components/AppointMent/AppointmentModal.vue b/src/modules/05_placement/components/AppointMent/AppointmentModal.vue
index 9e5c49897..6935217bb 100644
--- a/src/modules/05_placement/components/AppointMent/AppointmentModal.vue
+++ b/src/modules/05_placement/components/AppointMent/AppointmentModal.vue
@@ -9,7 +9,14 @@ import config from "@/app.config";
 
 const $q = useQuasar();
 const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
-const { date2Thai, hideLoader, messageError, showLoader, success,dialogConfirm } = mixin; //ฟังก์ชันกลางที่เรียกใช้
+const {
+  date2Thai,
+  hideLoader,
+  messageError,
+  showLoader,
+  success,
+  dialogConfirm,
+} = mixin; //ฟังก์ชันกลางที่เรียกใช้
 
 const notFound = ref<string>("ไม่พบข้อมูลที่ค้นหา");
 const noData = ref<string>("ไม่พบข้อมูลผังโครงสร้าง");
@@ -106,8 +113,6 @@ const fetchplacementPosition = async () => {
     });
 };
 
-
-
 const props = defineProps({
   personalId: String,
   modal: Boolean,
@@ -126,15 +131,18 @@ const myFilterMethod = (node: any, filter: string) => {
     (node.organizationName && node.organizationName.indexOf(filt) > -1) ||
     (node.positionNum && node.positionNum.indexOf(filt) > -1) ||
     (node.positionName && node.positionName.indexOf(filt) > -1) ||
-    (node.governmentCode && node.governmentCode.toString().indexOf(filt) > -1) ||
+    (node.governmentCode &&
+      node.governmentCode.toString().indexOf(filt) > -1) ||
     (node.agency && node.agency.indexOf(filt) > -1) ||
     (node.government && node.government.indexOf(filt) > -1) ||
     (node.department && node.department.indexOf(filt) > -1) ||
     (node.pile && node.pile.indexOf(filt) > -1) ||
-    (node.organizationShortName && node.organizationShortName.indexOf(filt) > -1) ||
+    (node.organizationShortName &&
+      node.organizationShortName.indexOf(filt) > -1) ||
     (node.positionSideName && node.positionSideName.indexOf(filt) > -1) ||
     (node.executivePosition && node.executivePosition.indexOf(filt) > -1) ||
-    (node.executivePositionSide && node.executivePositionSide.indexOf(filt) > -1) ||
+    (node.executivePositionSide &&
+      node.executivePositionSide.indexOf(filt) > -1) ||
     (node.positionLevel && node.positionLevel.indexOf(filt) > -1)
   );
 };
@@ -183,7 +191,6 @@ const saveAppoint = async () => {
   });
 };
 
-
 const closeModal = () => {
   if (editDataStatus.value == true) {
     dialogConfirm(
@@ -258,7 +265,6 @@ const positionLevelOptions = ref<Object[]>([
 
 const selectedPosition = async (data: any) => {
   if (data.name == null && selected.value != data.keyId) {
-
     editDataStatus.value = true;
     selected.value = data.keyId;
 
@@ -346,7 +352,6 @@ const checkPosition = (val: string) => {
   return num;
 };
 
-
 watch(props, () => {
   expanded.value = [];
   const dataPersonal = props.personal;
@@ -368,7 +373,6 @@ watch(props, () => {
         }
       }
     });
-
   }
 });
 
@@ -566,7 +570,6 @@ function findByPerson(element: any): any {
                             class="full-width inputgreen cursor-pointer"
                             outlined
                             dense
-                            lazy-rules
                             :model-value="
                               date2Thai(new Date(dataForm.containDate))
                             "
diff --git a/src/modules/05_placement/components/AppointMent/Detail.vue b/src/modules/05_placement/components/AppointMent/Detail.vue
index fbfd54ba2..2fb0e0edb 100644
--- a/src/modules/05_placement/components/AppointMent/Detail.vue
+++ b/src/modules/05_placement/components/AppointMent/Detail.vue
@@ -14,7 +14,7 @@ import type { QForm } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
-  
+
 const modalPersonal = ref<boolean>(false);
 const personId = ref<string>("");
 const $q = useQuasar();
@@ -395,7 +395,6 @@ onMounted(async () => {
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :readonly="!edit"
                     :model-value="date !== null ? date2Thai(date) : null"
@@ -429,7 +428,6 @@ onMounted(async () => {
               :readonly="!edit"
               :borderless="!edit"
               v-model="reason"
-             
               hide-bottom-space
               :label="`${'หมายเหตุ '}`"
               type="textarea"
diff --git a/src/modules/05_placement/components/Other/Detail.vue b/src/modules/05_placement/components/Other/Detail.vue
index 714390ecb..95fde264e 100644
--- a/src/modules/05_placement/components/Other/Detail.vue
+++ b/src/modules/05_placement/components/Other/Detail.vue
@@ -18,7 +18,7 @@ import keycloak from "@/plugins/keycloak";
 
 import CurruncyInput from "@/components/CurruncyInput.vue";
 import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
-  
+
 const modalPersonal = ref<boolean>(false);
 const personId = ref<string>("");
 const $q = useQuasar();
@@ -434,7 +434,6 @@ onMounted(async () => {
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :readonly="!edit"
                     :borderless="!edit"
                     :model-value="date !== null ? date2Thai(date) : null"
@@ -528,7 +527,6 @@ onMounted(async () => {
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :readonly="!edit"
                     :borderless="!edit"
                     :model-value="
diff --git a/src/modules/05_placement/components/Other/OtherModal.vue b/src/modules/05_placement/components/Other/OtherModal.vue
index 782be968a..8bc20313d 100644
--- a/src/modules/05_placement/components/Other/OtherModal.vue
+++ b/src/modules/05_placement/components/Other/OtherModal.vue
@@ -172,7 +172,7 @@ const saveAppoint = async () => {
         // mouthSalaryAmount: dataForm.mouthSalaryAmount,
         // positionSalaryAmount: dataForm.positionSalaryAmount,
       };
-      
+
       showLoader();
       await http
         .put(config.API.otherPosition(id.value), dataAppoint)
@@ -277,8 +277,6 @@ const positionLevelOptions = ref<Object[]>([
 
 const selectedPosition = async (data: any) => {
   if (data.name == null && selected.value != data.keyId) {
-    
-
     editDataStatus.value = true;
     selected.value = data.keyId;
 
@@ -359,7 +357,6 @@ const selectedPosition = async (data: any) => {
     dataForm.positionPathSideId = "";
     dataForm.positionTypeId = "";
   }
-
 };
 
 const checkPosition = (val: string) => {
@@ -372,25 +369,19 @@ const expanded = ref<string[]>([]);
 watch(props, () => {
   expanded.value = [];
   const dataPersonal = props.personal;
- 
 
   if (dataPersonal) {
     dataPersonal.map((data: any) => {
       personal.value = data;
     });
-    
   }
- 
 
   if (personal.value) {
-
     let findData: any = null;
     dataRespone.value.map((x: any) => {
       findData = findByPerson(x);
-    
 
       if (findData != null) {
-        
         selectedPosition(findData);
         for (let i = 3; i <= findData.keyId.length; i += 2) {
           expanded.value.push(findData.keyId.slice(0, i));
@@ -597,7 +588,6 @@ function findByPerson(element: any): any {
                             class="full-width inputgreen cursor-pointer"
                             outlined
                             dense
-                            lazy-rules
                             :model-value="
                               date2Thai(new Date(dataForm.containDate))
                             "
diff --git a/src/modules/05_placement/components/PersonalDetail/Education.vue b/src/modules/05_placement/components/PersonalDetail/Education.vue
index 10ed86e72..5541abe83 100644
--- a/src/modules/05_placement/components/PersonalDetail/Education.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Education.vue
@@ -870,7 +870,6 @@ const getClass = (val: boolean) => {
                           :class="getClass(edit)"
                           :outlined="edit"
                           dense
-                          lazy-rules
                           :borderless="!edit"
                           :model-value="startDate + 543"
                           :rules="[
@@ -915,7 +914,6 @@ const getClass = (val: boolean) => {
                           :class="getClass(edit)"
                           :outlined="edit"
                           dense
-                          lazy-rules
                           :borderless="!edit"
                           :model-value="date2Thai(startDate2)"
                           :rules="[
@@ -965,7 +963,6 @@ const getClass = (val: boolean) => {
                           :class="getClass(edit)"
                           :outlined="edit"
                           dense
-                          lazy-rules
                           :borderless="!edit"
                           :model-value="endDate + 543"
                           :rules="[
@@ -1009,7 +1006,6 @@ const getClass = (val: boolean) => {
                           :class="getClass(edit)"
                           :outlined="edit"
                           dense
-                          lazy-rules
                           :borderless="!edit"
                           :model-value="date2Thai(endDate2)"
                           :rules="[
@@ -1059,7 +1055,6 @@ const getClass = (val: boolean) => {
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(finishDate)"
                     :rules="[
diff --git a/src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue b/src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue
index 558a8f65b..3df2ccc34 100644
--- a/src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue
@@ -327,7 +327,7 @@ const clickSave = async () => {
 /**
  * บันทึกเพิ่มข้อมูล
  */
-const saveData = async () => { 
+const saveData = async () => {
   showLoader();
   await http
     .post(config.API.placementCertId(route.params.personalId.toString()), {
@@ -699,7 +699,6 @@ const getClass = (val: boolean) => {
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(issueDate)"
                     :rules="[
@@ -745,7 +744,6 @@ const getClass = (val: boolean) => {
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(expireDate)"
                     :rules="[(val) => !!val || `${'กรุณาเลือกวันที่หมดอายุ'}`]"
diff --git a/src/modules/05_placement/components/PersonalDetail/Information/Information.vue b/src/modules/05_placement/components/PersonalDetail/Information/Information.vue
index 8b13435cc..e79bdcb70 100644
--- a/src/modules/05_placement/components/PersonalDetail/Information/Information.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Information/Information.vue
@@ -438,7 +438,6 @@ const getClass = (val: boolean) => {
                 hide-bottom-space
                 :outlined="edit"
                 dense
-                lazy-rules
                 :readonly="!edit"
                 :borderless="!edit"
                 :model-value="
diff --git a/src/modules/05_placement/components/PersonalList/CardPosition.vue b/src/modules/05_placement/components/PersonalList/CardPosition.vue
index 934485e1e..37397d433 100644
--- a/src/modules/05_placement/components/PersonalList/CardPosition.vue
+++ b/src/modules/05_placement/components/PersonalList/CardPosition.vue
@@ -345,7 +345,6 @@ onMounted(async () => {
                       hide-bottom-space
                       :model-value="date != null ? date2Thai(date) : null"
                       label="วันที่รายงานตัว"
-                      lazy-rules
                     >
                       <template v-slot:prepend>
                         <q-icon
diff --git a/src/modules/05_placement/components/PersonalList/OrgTree.vue b/src/modules/05_placement/components/PersonalList/OrgTree.vue
index 8771c8632..85ea2dc0c 100644
--- a/src/modules/05_placement/components/PersonalList/OrgTree.vue
+++ b/src/modules/05_placement/components/PersonalList/OrgTree.vue
@@ -61,7 +61,7 @@ let dataForm = reactive({
 });
 
 /** ฟังชั่น get file*/
-async function fetchPublishFile(){
+async function fetchPublishFile() {
   await http
     .get(config.API.getPublishFileHistory)
     .then((res) => {
@@ -74,7 +74,7 @@ async function fetchPublishFile(){
     .finally(async () => {
       hideLoader();
     });
-};
+}
 
 /** โหลดข้อมูลโครงสร้างจาก json */
 const loadTreeData = async () => {
@@ -596,7 +596,6 @@ onMounted(async () => {
                             class="full-width inputgreen cursor-pointer"
                             outlined
                             dense
-                            lazy-rules
                             :model-value="
                               date2Thai(new Date(dataForm.containDate))
                             "
diff --git a/src/modules/05_placement/components/Receive/receiveDetail2.vue b/src/modules/05_placement/components/Receive/receiveDetail2.vue
index 529e0a9f8..de959e95a 100644
--- a/src/modules/05_placement/components/Receive/receiveDetail2.vue
+++ b/src/modules/05_placement/components/Receive/receiveDetail2.vue
@@ -661,7 +661,7 @@ onMounted(async () => {
                     hide-bottom-space
                     :outlined="edit"
                     dense
-                    lazy-rules
+                    
                     :readonly="!edit"
                     :borderless="!edit"
                     :model-value="
diff --git a/src/modules/05_placement/components/Receive/receiveModal.vue b/src/modules/05_placement/components/Receive/receiveModal.vue
index cc3bc1734..3cee75384 100644
--- a/src/modules/05_placement/components/Receive/receiveModal.vue
+++ b/src/modules/05_placement/components/Receive/receiveModal.vue
@@ -538,7 +538,7 @@ onMounted(async () => {
                             class="full-width inputgreen cursor-pointer"
                             outlined
                             dense
-                            lazy-rules
+                            
                             :model-value="
                               date2Thai(new Date(dataForm.containDate))
                             "
diff --git a/src/modules/05_placement/components/Relocation/RelocationModal.vue b/src/modules/05_placement/components/Relocation/RelocationModal.vue
index 418cc5ead..f2fd2233f 100644
--- a/src/modules/05_placement/components/Relocation/RelocationModal.vue
+++ b/src/modules/05_placement/components/Relocation/RelocationModal.vue
@@ -283,8 +283,6 @@ const positionLevelOptions = ref<Object[]>([
 
 const selectedPosition = async (data: any) => {
   if (data.name == null && selected.value != data.keyId) {
-    
-
     editDataStatus.value = true;
     selected.value = data.keyId;
 
@@ -384,7 +382,6 @@ watch(props, () => {
     });
   }
 
-
   if (personal.value) {
     // const findData = dataRespone.value.find(findByPerson);
     let findData: any = null;
@@ -598,7 +595,6 @@ function findByPerson(element: any): any {
                             class="full-width inputgreen cursor-pointer"
                             outlined
                             dense
-                            lazy-rules
                             :model-value="
                               date2Thai(new Date(dataForm.containDate))
                             "
diff --git a/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue b/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue
index 8f63424cd..44690bf00 100644
--- a/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue
+++ b/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue
@@ -13,7 +13,7 @@ import config from "@/app.config";
 import type { QForm } from "quasar";
 import type { ResponseData } from "@/modules/05_placement/interface/response/officer";
 import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
-  
+
 const modalPersonal = ref<boolean>(false);
 const personalId = ref<string>("");
 const $q = useQuasar();
@@ -386,7 +386,6 @@ onMounted(async () => {
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :readonly="!edit"
                     :borderless="!edit"
                     :model-value="date !== null ? date2Thai(date) : null"
@@ -431,7 +430,6 @@ onMounted(async () => {
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :readonly="!edit"
                     :borderless="!edit"
                     :model-value="
diff --git a/src/modules/05_placement/components/Transfer/transferRegistry.vue b/src/modules/05_placement/components/Transfer/transferRegistry.vue
index 957985933..e8f5b9ae1 100644
--- a/src/modules/05_placement/components/Transfer/transferRegistry.vue
+++ b/src/modules/05_placement/components/Transfer/transferRegistry.vue
@@ -664,7 +664,7 @@ onMounted(async () => {
                         :class="getClass(edit)"
                         :outlined="edit"
                         dense
-                        lazy-rules
+                       
                         :borderless="!edit"
                         :readonly="!edit"
                         :model-value="date !== null ? date2Thai(date) : null"
diff --git a/src/modules/05_placement/components/helpgovernment/governmentDetail.vue b/src/modules/05_placement/components/helpgovernment/governmentDetail.vue
index 63a13f632..f22988124 100644
--- a/src/modules/05_placement/components/helpgovernment/governmentDetail.vue
+++ b/src/modules/05_placement/components/helpgovernment/governmentDetail.vue
@@ -8,7 +8,7 @@ import config from "@/app.config";
 import type { QForm } from "quasar";
 import type { resHelpDetail } from "@/modules/05_placement/interface/response/officer";
 import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
-  
+
 const modalPersonal = ref<boolean>(false);
 const personId = ref<string>("");
 const $q = useQuasar();
@@ -316,7 +316,6 @@ onMounted(async () => {
                     :outlined="edit"
                     dense
                     :readonly="!edit"
-                    lazy-rules
                     :borderless="!edit"
                     :rules="[(val) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`]"
                     :model-value="
@@ -363,7 +362,6 @@ onMounted(async () => {
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="dateEnd !== null ? date2Thai(dateEnd) : null"
                     :rules="[(val) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`]"
diff --git a/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue b/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue
index 46b1805c7..8e4bd37b1 100644
--- a/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue
+++ b/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue
@@ -12,7 +12,7 @@ import keycloak from "@/plugins/keycloak";
 import type { QForm } from "quasar";
 import type { ResponseDataDetail } from "@/modules/06_retirement/interface/response/discharged";
 import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
-  
+
 const modalPersonal = ref<boolean>(false);
 const personId = ref<string>("");
 /** use */
@@ -187,7 +187,6 @@ function onclickViewinfo(id: string) {
 function updatemodalPersonal(modal: boolean) {
   modalPersonal.value = modal;
 }
-
 </script>
 <template>
   <div class="toptitle text-dark col-12 row items-center">
@@ -423,7 +422,6 @@ function updatemodalPersonal(modal: boolean) {
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :readonly="!edit"
                     :borderless="!edit"
                     :model-value="date !== null ? date2Thai(date) : null"
diff --git a/src/modules/06_retirement/components/DismissOrder/outRegistry.vue b/src/modules/06_retirement/components/DismissOrder/outRegistry.vue
index 4b632fa7d..aef4b58be 100644
--- a/src/modules/06_retirement/components/DismissOrder/outRegistry.vue
+++ b/src/modules/06_retirement/components/DismissOrder/outRegistry.vue
@@ -12,7 +12,7 @@ import keycloak from "@/plugins/keycloak";
 import type { QForm } from "quasar";
 import type { ResponseDataDetail } from "@/modules/06_retirement/interface/response/expulsion";
 import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
-  
+
 const modalPersonal = ref<boolean>(false);
 const personId = ref<string>("");
 /** use */
@@ -426,7 +426,6 @@ function updatemodalPersonal(modal: boolean) {
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :readonly="!edit"
                     :borderless="!edit"
                     :model-value="date !== null ? date2Thai(date) : null"
diff --git a/src/modules/06_retirement/components/ExitInterview/exitMain.vue b/src/modules/06_retirement/components/ExitInterview/exitMain.vue
index f4aa33d7a..211738f2b 100644
--- a/src/modules/06_retirement/components/ExitInterview/exitMain.vue
+++ b/src/modules/06_retirement/components/ExitInterview/exitMain.vue
@@ -499,7 +499,6 @@ const openModalCalendar = (rows: any) => {
                 <q-input
                   outlined
                   dense
-                  lazy-rules
                   :model-value="
                     dateBreak !== null ? date2Thai(dateBreak) : null
                   "
diff --git a/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue b/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue
index fa9bc6187..0bc950483 100644
--- a/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue
+++ b/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue
@@ -11,7 +11,7 @@ import keycloak from "@/plugins/keycloak";
 import type { QForm } from "quasar";
 import type { ResponseDataDetail } from "@/modules/06_retirement/interface/response/expulsion";
 import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
-  
+
 const modalPersonal = ref<boolean>(false);
 const personId = ref<string>("");
 /** Use */
@@ -436,7 +436,6 @@ function updatemodalPersonal(modal: boolean) {
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :readonly="!edit"
                     :model-value="date !== null ? date2Thai(date) : null"
diff --git a/src/modules/06_retirement/components/ListRetirement/TableList.vue b/src/modules/06_retirement/components/ListRetirement/TableList.vue
index 5993b15b1..cfd285482 100644
--- a/src/modules/06_retirement/components/ListRetirement/TableList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/TableList.vue
@@ -837,7 +837,6 @@ function updatemodalPersonal(modal: boolean) {
                     dense
                     outlined
                     :rules="[(val) => !!val || `${'กรุณาเลือกวันที่'}`]"
-                    lazy-rules
                     :model-value="
                       signDate !== null ? date2Thai(signDate) : null
                     "
diff --git a/src/modules/06_retirement/components/resign/ResignByid.vue b/src/modules/06_retirement/components/resign/ResignByid.vue
index deb4d5b5a..dd390f9d4 100644
--- a/src/modules/06_retirement/components/resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/resign/ResignByid.vue
@@ -314,7 +314,6 @@ const clickCancelConditions = async () => {
   conditions.value = false;
 };
 
-
 const saveConditions = () => {
   if (myForm.value !== null) {
     myForm.value.validate().then((success) => {
@@ -335,9 +334,7 @@ const saveConditions = () => {
 };
 
 //Save จาก Api
-const dataSave = async () => {
-
-};
+const dataSave = async () => {};
 
 /**
  * Functionบันทึก
@@ -361,7 +358,6 @@ const conditionSave = () => {
   }
 };
 
-
 //Save จาก Api
 const saveData = async () => {
   const formData = new FormData();
@@ -772,7 +768,7 @@ function confirmRemove(fileId: string) {
           label="แก้ไข"
           style="width: 80px"
           @click="conditions = !conditions"
-        />  
+        />
       </div>
       <div v-else class="q-gutter-x-sm">
         <q-btn
@@ -1153,7 +1149,6 @@ function confirmRemove(fileId: string) {
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date !== null ? date2Thai(date) : null"
                     :rules="[
@@ -1304,7 +1299,6 @@ function confirmRemove(fileId: string) {
                 <q-input
                   outlined
                   dense
-                  lazy-rules
                   :model-value="
                     dateBreak !== null ? date2Thai(dateBreak) : null
                   "
diff --git a/src/modules/07_insignia/components/1_Proposals/addProposals.vue b/src/modules/07_insignia/components/1_Proposals/addProposals.vue
index ff2887104..4146517eb 100644
--- a/src/modules/07_insignia/components/1_Proposals/addProposals.vue
+++ b/src/modules/07_insignia/components/1_Proposals/addProposals.vue
@@ -250,7 +250,6 @@ onMounted(async () => {
                   <template #trigger>
                     <q-input
                       dense
-                      lazy-rules
                       outlined
                       :model-value="yearly + 543"
                       :rules="[(val) => !!val || `${'กรุณาเลือกปีที่เสนอ'}`]"
diff --git a/src/modules/07_insignia/components/3_result/DialogForm.vue b/src/modules/07_insignia/components/3_result/DialogForm.vue
index 1bf3cc0ef..79252e3c8 100644
--- a/src/modules/07_insignia/components/3_result/DialogForm.vue
+++ b/src/modules/07_insignia/components/3_result/DialogForm.vue
@@ -659,7 +659,6 @@ const filterSelector = (val: any, update: Function, name: any) => {
                     dense
                     borderless
                     outlined
-                    lazy-rules
                     hide-bottom-space
                     :model-value="
                       invoiceDate != null ? date2Thai(invoiceDate) : undefined
diff --git a/src/modules/07_insignia/components/3_result/Dialogbody.vue b/src/modules/07_insignia/components/3_result/Dialogbody.vue
index 96e08ca04..0af969e00 100644
--- a/src/modules/07_insignia/components/3_result/Dialogbody.vue
+++ b/src/modules/07_insignia/components/3_result/Dialogbody.vue
@@ -91,11 +91,11 @@ async function SaveData(type: string, id: string) {
 function dataSave(type: string, id: string) {
   const formData = new FormData();
   if (props.dateCheckReceive === null) {
-    formData.append("Date", dateToISO(Datereceive.value as Date ?? nullii));
+    formData.append("Date", dateToISO((Datereceive.value as Date) ?? nullii));
     formData.append("File", files.value);
     formData.append("OrgId", OrganazationId.value);
   } else {
-    formData.append("Date", dateToISO(Datereturn.value as Date?? nullii));
+    formData.append("Date", dateToISO((Datereturn.value as Date) ?? nullii));
     formData.append("File", filesReturn.value);
     formData.append("OrgId", OrganazationId2.value);
   }
@@ -226,7 +226,7 @@ watch(props, () => {
                     :label="`${'วันที่ได้รับ'}`"
                     :disable="dateCheckReceive !== null"
                   >
-                  <template v-if="Datereceive" v-slot:append>
+                    <template v-if="Datereceive" v-slot:append>
                       <q-icon
                         name="cancel"
                         @click.stop.prevent="Datereceive = null"
@@ -319,7 +319,6 @@ watch(props, () => {
                     dense
                     borderless
                     outlined
-                    lazy-rules
                     :rules="[(val) => !!val || 'กรุณาเลือกวันที่คืน']"
                     hide-bottom-space
                     :model-value="
diff --git a/src/modules/07_insignia/components/5_Borrow/DialogForm.vue b/src/modules/07_insignia/components/5_Borrow/DialogForm.vue
index 8f05753c6..9eff283e9 100644
--- a/src/modules/07_insignia/components/5_Borrow/DialogForm.vue
+++ b/src/modules/07_insignia/components/5_Borrow/DialogForm.vue
@@ -232,7 +232,7 @@ async function searchcardid() {
   } else {
     fullName.value = "";
     brand.value = "";
-    receivedate.value = null
+    receivedate.value = null;
     // OrganazationId.value = "";
   }
 }
@@ -243,7 +243,6 @@ function closeDialog() {
   props.close();
 }
 
-
 /** function reset วันที่คืน*/
 function clearReturnDate() {
   returndate.value = null;
@@ -420,13 +419,13 @@ watch(props, () => {
                       "
                       :label="`${'วันที่ยืม'}`"
                     >
-                    <template v-if="receivedate" v-slot:append>
-                      <q-icon
-                        name="cancel"
-                        @click.stop.prevent="receivedate = null"
-                        class="cursor-pointer"
-                      />
-                    </template>
+                      <template v-if="receivedate" v-slot:append>
+                        <q-icon
+                          name="cancel"
+                          @click.stop.prevent="receivedate = null"
+                          class="cursor-pointer"
+                        />
+                      </template>
                     </q-input>
                   </template>
                 </datepicker>
@@ -483,7 +482,6 @@ watch(props, () => {
                       dense
                       borderless
                       outlined
-                      lazy-rules
                       :rules="[(val) => !!val || 'กรุณาเลือกวันที่คืน']"
                       hide-bottom-space
                       :model-value="
diff --git a/src/modules/08_registryEmployee/components/AddEmployee/Main.vue b/src/modules/08_registryEmployee/components/AddEmployee/Main.vue
index 157ad7948..3cc7d286e 100644
--- a/src/modules/08_registryEmployee/components/AddEmployee/Main.vue
+++ b/src/modules/08_registryEmployee/components/AddEmployee/Main.vue
@@ -447,7 +447,6 @@ const clickBack = () => {
                   hide-bottom-space
                   outlined
                   dense
-                  lazy-rules
                   :model-value="
                     informaData.birthDate == null
                       ? null
diff --git a/src/modules/08_registryEmployee/components/EditEmployee/Assessment.vue b/src/modules/08_registryEmployee/components/EditEmployee/Assessment.vue
index b9ff755a8..8cd904c7e 100644
--- a/src/modules/08_registryEmployee/components/EditEmployee/Assessment.vue
+++ b/src/modules/08_registryEmployee/components/EditEmployee/Assessment.vue
@@ -35,8 +35,15 @@ const store = useProfileDataStore();
 const { profileData, changeProfileColumns } = store;
 
 const mixin = useCounterMixin();
-const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader,dialogConfirm } =
-  mixin;
+const {
+  date2Thai,
+  success,
+  dateToISO,
+  messageError,
+  showLoader,
+  hideLoader,
+  dialogConfirm,
+} = mixin;
 const route = useRoute();
 const id = ref<string>("");
 const name = ref<string>();
@@ -395,9 +402,9 @@ const clickAdd = async () => {
 /**
  * กดบันทึกใน dialog
  */
-const clickSave = () =>{
-  dialogConfirm($q,()=>SaveData())
-}
+const clickSave = () => {
+  dialogConfirm($q, () => SaveData());
+};
 const SaveData = async () => {
   await myForm.value.validate().then(async (result: boolean) => {
     if (result) {
@@ -735,9 +742,7 @@ const textPoint = (val: number | undefined) => {
         />
         <q-separator />
         <q-card-section class="q-p-sm">
-          <div
-            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
-          >
+          <div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
             <div class="col-xs-12 col-sm-12 col-md-12">
               <datepicker
                 menu-class-name="modalfix"
@@ -758,7 +763,6 @@ const textPoint = (val: number | undefined) => {
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(date)"
                     :rules="[(val) => !!val || `${'กรุณาเลือกวันที่ได้รับ'}`]"
diff --git a/src/modules/08_registryEmployee/components/EditEmployee/Discipline.vue b/src/modules/08_registryEmployee/components/EditEmployee/Discipline.vue
index 5ecb2868b..ed4899acb 100644
--- a/src/modules/08_registryEmployee/components/EditEmployee/Discipline.vue
+++ b/src/modules/08_registryEmployee/components/EditEmployee/Discipline.vue
@@ -34,8 +34,15 @@ const store = useProfileDataStore();
 const { profileData, changeProfileColumns } = store;
 
 const mixin = useCounterMixin();
-const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader, dialogConfirm } =
-  mixin;
+const {
+  date2Thai,
+  success,
+  dateToISO,
+  messageError,
+  showLoader,
+  hideLoader,
+  dialogConfirm,
+} = mixin;
 const route = useRoute();
 const id = ref<string>("");
 const level = ref<string>();
@@ -415,8 +422,8 @@ const clickAdd = async () => {
  * กดบันทึกใน dialog
  */
 const clickSave = () => {
-  dialogConfirm($q,()=>SaveData())
-}
+  dialogConfirm($q, () => SaveData());
+};
 const SaveData = async () => {
   await myForm.value.validate().then(async (result: boolean) => {
     if (result) {
@@ -723,9 +730,7 @@ const resetFilter = () => {};
         <DialogHeader tittle="วินัย" :close="clickClose" />
         <q-separator />
         <q-card-section class="q-p-sm">
-          <div
-            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
-          >
+          <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
                 menu-class-name="modalfix"
@@ -746,7 +751,6 @@ const resetFilter = () => {};
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(date)"
                     :rules="[(val:string) => !!val || `${'กรุณาเลือกวัน เดือน ปี'}`]"
@@ -866,7 +870,6 @@ const resetFilter = () => {};
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="
                       refCommandDate == null ? null : date2Thai(refCommandDate)
diff --git a/src/modules/08_registryEmployee/components/EditEmployee/Education.vue b/src/modules/08_registryEmployee/components/EditEmployee/Education.vue
index 9c1fcbe9a..72df895cf 100644
--- a/src/modules/08_registryEmployee/components/EditEmployee/Education.vue
+++ b/src/modules/08_registryEmployee/components/EditEmployee/Education.vue
@@ -32,8 +32,15 @@ const store = useProfileDataStore();
 const { profileData, changeProfileColumns } = store;
 
 const mixin = useCounterMixin();
-const { success, dateToISO, date2Thai, messageError, showLoader, hideLoader,dialogConfirm } =
-  mixin;
+const {
+  success,
+  dateToISO,
+  date2Thai,
+  messageError,
+  showLoader,
+  hideLoader,
+  dialogConfirm,
+} = mixin;
 const route = useRoute();
 const id = ref<string>("");
 const levelId = ref<string>();
@@ -657,8 +664,8 @@ const clickAdd = async () => {
  * กดบันทึกใน dialog
  */
 const clickSave = () => {
-  dialogConfirm($q,() => SaveData() )
-}
+  dialogConfirm($q, () => SaveData());
+};
 const SaveData = async () => {
   await myForm.value.validate().then(async (result: boolean) => {
     if (result) {
@@ -1054,9 +1061,7 @@ const getClass = (val: boolean) => {
         <DialogHeader tittle="ประวัติการศึกษา" :close="clickClose" />
         <q-separator />
         <q-card-section class="q-p-sm">
-          <div
-            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
-          >
+          <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">
               <selector
                 :class="getClass(edit)"
@@ -1142,7 +1147,6 @@ const getClass = (val: boolean) => {
                           :class="getClass(edit)"
                           :outlined="edit"
                           dense
-                          lazy-rules
                           :borderless="!edit"
                           :model-value="startDate + 543"
                           :rules="[
@@ -1187,7 +1191,6 @@ const getClass = (val: boolean) => {
                           :class="getClass(edit)"
                           :outlined="edit"
                           dense
-                          lazy-rules
                           :borderless="!edit"
                           :model-value="date2Thai(startDate2)"
                           :rules="[
@@ -1237,7 +1240,6 @@ const getClass = (val: boolean) => {
                           :class="getClass(edit)"
                           :outlined="edit"
                           dense
-                          lazy-rules
                           :borderless="!edit"
                           :model-value="endDate + 543"
                           :rules="[
@@ -1281,7 +1283,6 @@ const getClass = (val: boolean) => {
                           :class="getClass(edit)"
                           :outlined="edit"
                           dense
-                          lazy-rules
                           :borderless="!edit"
                           :model-value="date2Thai(endDate2)"
                           :rules="[
@@ -1331,7 +1332,6 @@ const getClass = (val: boolean) => {
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(finishDate)"
                     :rules="[
diff --git a/src/modules/08_registryEmployee/components/EditEmployee/Employment.vue b/src/modules/08_registryEmployee/components/EditEmployee/Employment.vue
index 085cb07b4..6cd103233 100644
--- a/src/modules/08_registryEmployee/components/EditEmployee/Employment.vue
+++ b/src/modules/08_registryEmployee/components/EditEmployee/Employment.vue
@@ -311,29 +311,71 @@ const paginationHis = ref({
   <q-card flat bordered class="col-12 q-px-lg q-py-md">
     <div class="flex items-center">
       <div class="flex items-center">
-        <q-icon name="mdi-clipboard" size="1.5em" color="grey-5" class="q-mr-md" />
+        <q-icon
+          name="mdi-clipboard"
+          size="1.5em"
+          color="grey-5"
+          class="q-mr-md"
+        />
 
         <div class="text-bold text-subtitle2 col-12 row items-center">
           ข้อมูลการจ้าง
         </div>
       </div>
       <div class="q-gutter-sm q-mx-sm">
-        <q-btn size="12px" flat round color="primary" @click="onClickAdd" icon="mdi-plus">
+        <q-btn
+          size="12px"
+          flat
+          round
+          color="primary"
+          @click="onClickAdd"
+          icon="mdi-plus"
+        >
           <q-tooltip>เพิ่มข้อมูลการจ้าง</q-tooltip>
         </q-btn>
       </div>
 
       <q-space />
       <div class="q-gutter-sm" style="display: flex">
-        <q-input outlined dense v-model="filter" label="ค้นหา" style="min-width: 150px" />
+        <q-input
+          outlined
+          dense
+          v-model="filter"
+          label="ค้นหา"
+          style="min-width: 150px"
+        />
 
-        <q-select v-model="visibleColumns" multiple outlined dense options-dense :display-value="$q.lang.table.columns"
-          emit-value map-options :options="columns" option-value="name" options-cover style="min-width: 150px" />
+        <q-select
+          v-model="visibleColumns"
+          multiple
+          outlined
+          dense
+          options-dense
+          :display-value="$q.lang.table.columns"
+          emit-value
+          map-options
+          :options="columns"
+          option-value="name"
+          options-cover
+          style="min-width: 150px"
+        />
       </div>
     </div>
     <div class="q-mt-sm">
-      <d-table flat bordered id="table" ref="table" :columns="columns" :rows="rows" :filter="filter"
-        row-key="dateEmployment" :paging="true" dense :visible-columns="visibleColumns" v-model:pagination="pagination">
+      <d-table
+        flat
+        bordered
+        id="table"
+        ref="table"
+        :columns="columns"
+        :rows="rows"
+        :filter="filter"
+        row-key="dateEmployment"
+        :paging="true"
+        dense
+        :visible-columns="visibleColumns"
+        v-model:pagination="pagination"
+      >
         <template v-slot:header="props">
           <q-tr :props="props">
             <q-th v-for="col in props.cols" :key="col.name" :props="props">
@@ -352,16 +394,38 @@ const paginationHis = ref({
               </div>
             </q-td>
             <q-td>
-              <q-btn dense flat round color="primary" icon="mdi-pencil" @click="clickEdit(props.row, 'edit')">
+              <q-btn
+                dense
+                flat
+                round
+                color="primary"
+                icon="mdi-pencil"
+                @click="clickEdit(props.row, 'edit')"
+              >
                 <q-tooltip>แก้ไขข้อมูล</q-tooltip>
               </q-btn>
             </q-td>
             <q-td>
-              <q-btn dense flat round color="red" icon="mdi-delete" @click="cilckDelete(props.row.id)">
-                <q-tooltip>ลบข้อมูล</q-tooltip></q-btn>
+              <q-btn
+                dense
+                flat
+                round
+                color="red"
+                icon="mdi-delete"
+                @click="cilckDelete(props.row.id)"
+              >
+                <q-tooltip>ลบข้อมูล</q-tooltip></q-btn
+              >
             </q-td>
             <q-td>
-              <q-btn dense flat round color="info" @click="openPopupHistory(props.row.id)" icon="mdi-history">
+              <q-btn
+                dense
+                flat
+                round
+                color="info"
+                @click="openPopupHistory(props.row.id)"
+                icon="mdi-history"
+              >
                 <q-tooltip>ประวัติข้อมูลการจ้าง </q-tooltip>
               </q-btn>
             </q-td>
@@ -380,17 +444,33 @@ const paginationHis = ref({
           </span>
           <span style="margin-right: 0" v-else> เพิ่มข้อมูลการจ้าง </span>
         </q-toolbar-title>
-        <q-btn for="closeDialog" icon="close" unelevated round dense style="color: #eb0505; background-color: #ffdede"
-          @click="colsePopup" />
+        <q-btn
+          for="closeDialog"
+          icon="close"
+          unelevated
+          round
+          dense
+          style="color: #eb0505; background-color: #ffdede"
+          @click="colsePopup"
+        />
       </q-toolbar>
       <q-separator />
       <form @submit.prevent="validateForm">
         <q-card-section class="q-pt-none">
           <div class="col-12 row q-pa-md">
-            <div class="col-xs-12 col-sm-12 row q-col-gutter-x-md q-col-gutter-y-xs">
+            <div
+              class="col-xs-12 col-sm-12 row q-col-gutter-x-md q-col-gutter-y-xs"
+            >
               <div class="col-xs-12 col-sm-6">
-                <datepicker menu-class-name="modalfix" v-model="formData.dateEmployment" :locale="'th'" autoApply
-                  borderless :enableTimePicker="false" week-start="0">
+                <datepicker
+                  menu-class-name="modalfix"
+                  v-model="formData.dateEmployment"
+                  :locale="'th'"
+                  autoApply
+                  borderless
+                  :enableTimePicker="false"
+                  week-start="0"
+                >
                   <template #year="{ year }">
                     {{ year + 543 }}
                   </template>
@@ -398,13 +478,26 @@ const paginationHis = ref({
                     {{ parseInt(value + 543) }}
                   </template>
                   <template #trigger>
-                    <q-input for="inputdateEmployment" ref="dateEmploymentRef" outlined dense
-                      class="full-width datepicker" :model-value="formData.dateEmployment != null
+                    <q-input
+                      for="inputdateEmployment"
+                      ref="dateEmploymentRef"
+                      outlined
+                      dense
+                      class="full-width datepicker"
+                      :model-value="
+                        formData.dateEmployment != null
                           ? date2Thai(formData.dateEmployment)
                           : null
-                        " label="วันที่จ้าง" :rules="[(val) => !!val || `${'กรุณาเลือกวันที่จ้าง'}`]" lazy-rules>
+                      "
+                      label="วันที่จ้าง"
+                      :rules="[(val) => !!val || `${'กรุณาเลือกวันที่จ้าง'}`]"
+                    >
                       <template v-slot:prepend>
-                        <q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)">
+                        <q-icon
+                          name="event"
+                          class="cursor-pointer"
+                          style="color: var(--q-primary)"
+                        >
                         </q-icon>
                       </template>
                     </q-input>
@@ -413,9 +506,16 @@ const paginationHis = ref({
               </div>
 
               <div class="col-xs-12 col-sm-6">
-                <q-input for="inputOrderEmployment" ref="orderEmploymentRef" dense outlined
-                  v-model="formData.orderEmployment" label="คำสั่งจ้าง"
-                  :rules="[(val) => !!val || `${'กรุณากรอกคำสั่งจ้าง'}`]" lazy-rules />
+                <q-input
+                  for="inputOrderEmployment"
+                  ref="orderEmploymentRef"
+                  dense
+                  outlined
+                  v-model="formData.orderEmployment"
+                  label="คำสั่งจ้าง"
+                  :rules="[(val) => !!val || `${'กรุณากรอกคำสั่งจ้าง'}`]"
+                  lazy-rules
+                />
               </div>
             </div>
           </div>
@@ -425,8 +525,16 @@ const paginationHis = ref({
         </q-card-section>
         <q-separator />
         <q-card-actions align="right" class="bg-white text-teal">
-          <q-btn for="ButtonOnSubmit" id="onSubmit" flat round color="secondary" icon="mdi-content-save-outline"
-            type="submit"><q-tooltip>บับทึกข้อมูล</q-tooltip></q-btn>
+          <q-btn
+            for="ButtonOnSubmit"
+            id="onSubmit"
+            flat
+            round
+            color="secondary"
+            icon="mdi-content-save-outline"
+            type="submit"
+            ><q-tooltip>บับทึกข้อมูล</q-tooltip></q-btn
+          >
         </q-card-actions>
       </form>
     </q-card>
@@ -438,8 +546,15 @@ const paginationHis = ref({
         <q-toolbar-title class="text-subtitle1 text-weight-bold">
           <span style="margin-right: 0"> ประวัติข้อมูลการจ้าง </span>
         </q-toolbar-title>
-        <q-btn for="closeDialog" icon="close" unelevated round dense style="color: #eb0505; background-color: #ffdede"
-          @click="colsePopup" />
+        <q-btn
+          for="closeDialog"
+          icon="close"
+          unelevated
+          round
+          dense
+          style="color: #eb0505; background-color: #ffdede"
+          @click="colsePopup"
+        />
       </q-toolbar>
       <q-separator />
 
@@ -447,16 +562,44 @@ const paginationHis = ref({
         <q-toolbar class="q-pa-none">
           <q-space />
           <div class="q-gutter-sm" style="display: flex">
-            <q-input outlined dense v-model="filterHis" label="ค้นหา" style="min-width: 150px" />
+            <q-input
+              outlined
+              dense
+              v-model="filterHis"
+              label="ค้นหา"
+              style="min-width: 150px"
+            />
 
-            <q-select v-model="visibleColumnsHis" multiple outlined dense options-dense
-              :display-value="$q.lang.table.columns" emit-value map-options :options="columnsHis" option-value="name"
-              options-cover style="min-width: 150px" />
+            <q-select
+              v-model="visibleColumnsHis"
+              multiple
+              outlined
+              dense
+              options-dense
+              :display-value="$q.lang.table.columns"
+              emit-value
+              map-options
+              :options="columnsHis"
+              option-value="name"
+              options-cover
+              style="min-width: 150px"
+            />
           </div>
         </q-toolbar>
-        <d-table flat bordered id="table" ref="table" :columns="columnsHis" :rows="rowsHis" :filter="filterHis"
-          row-key="dateEmployment" :paging="true" dense :visible-columns="visibleColumnsHis"
-          v-model:pagination="paginationHis">
+        <d-table
+          flat
+          bordered
+          id="table"
+          ref="table"
+          :columns="columnsHis"
+          :rows="rowsHis"
+          :filter="filterHis"
+          row-key="dateEmployment"
+          :paging="true"
+          dense
+          :visible-columns="visibleColumnsHis"
+          v-model:pagination="paginationHis"
+        >
           <template v-slot:header="props">
             <q-tr :props="props">
               <q-th v-for="col in props.cols" :key="col.name" :props="props">
diff --git a/src/modules/08_registryEmployee/components/EditEmployee/Information/Certicate.vue b/src/modules/08_registryEmployee/components/EditEmployee/Information/Certicate.vue
index 86496a414..f16d5fcdf 100644
--- a/src/modules/08_registryEmployee/components/EditEmployee/Information/Certicate.vue
+++ b/src/modules/08_registryEmployee/components/EditEmployee/Information/Certicate.vue
@@ -34,8 +34,15 @@ const store = useProfileDataStore();
 const { profileData, changeProfileColumns } = store;
 
 const mixin = useCounterMixin();
-const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader ,dialogConfirm} =
-  mixin;
+const {
+  date2Thai,
+  success,
+  dateToISO,
+  messageError,
+  showLoader,
+  hideLoader,
+  dialogConfirm,
+} = mixin;
 const route = useRoute();
 const id = ref<string>("");
 const certificateNo = ref<string>();
@@ -326,10 +333,10 @@ const clickAdd = async () => {
  * กดบันทึกใน dialog
  */
 const clickSave = () => {
-  dialogConfirm($q,() => SaveData())
-}
+  dialogConfirm($q, () => SaveData());
+};
 const SaveData = async () => {
- await myForm.value?.validate().then(async (result: boolean) => {
+  await myForm.value?.validate().then(async (result: boolean) => {
     if (result) {
       if (modalEdit.value) {
         await editData();
@@ -638,9 +645,7 @@ const getClass = (val: boolean) => {
         />
         <q-separator />
         <q-card-section class="q-p-sm">
-          <div
-            class="row col-12  q-col-gutter-x-xs q-col-gutter-y-xs"
-          >
+          <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
                 :class="getClass(edit)"
@@ -708,7 +713,6 @@ const getClass = (val: boolean) => {
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(issueDate)"
                     :rules="[
@@ -754,7 +758,6 @@ const getClass = (val: boolean) => {
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(expireDate)"
                     :rules="[(val) => !!val || `${'กรุณาเลือกวันที่หมดอายุ'}`]"
diff --git a/src/modules/08_registryEmployee/components/EditEmployee/Information/Government.vue b/src/modules/08_registryEmployee/components/EditEmployee/Information/Government.vue
index 2ab7421b4..3b54c158f 100644
--- a/src/modules/08_registryEmployee/components/EditEmployee/Information/Government.vue
+++ b/src/modules/08_registryEmployee/components/EditEmployee/Information/Government.vue
@@ -580,7 +580,6 @@ const getClass = (val: boolean) => {
                 hide-bottom-space
                 :outlined="edit"
                 dense
-                lazy-rules
                 :readonly="!edit"
                 :borderless="!edit"
                 :model-value="date2Thai(new Date(govermentData.containDate))"
@@ -633,7 +632,6 @@ const getClass = (val: boolean) => {
                 hide-bottom-space
                 :outlined="edit"
                 dense
-                lazy-rules
                 :readonly="!edit"
                 :borderless="!edit"
                 :model-value="date2Thai(new Date(govermentData.workDate))"
@@ -761,4 +759,4 @@ const getClass = (val: boolean) => {
       </q-tr>
     </template>
   </HistoryTable>
-</template>
\ No newline at end of file
+</template>
diff --git a/src/modules/08_registryEmployee/components/EditEmployee/Information/Information.vue b/src/modules/08_registryEmployee/components/EditEmployee/Information/Information.vue
index 45d94b257..90f8cee8a 100644
--- a/src/modules/08_registryEmployee/components/EditEmployee/Information/Information.vue
+++ b/src/modules/08_registryEmployee/components/EditEmployee/Information/Information.vue
@@ -861,7 +861,6 @@ const getClass = (val: boolean) => {
                 hide-bottom-space
                 :outlined="edit"
                 dense
-                lazy-rules
                 :readonly="!edit"
                 :borderless="!edit"
                 :model-value="
diff --git a/src/modules/08_registryEmployee/components/EditEmployee/Leave.vue b/src/modules/08_registryEmployee/components/EditEmployee/Leave.vue
index a9f25a797..7648f674d 100644
--- a/src/modules/08_registryEmployee/components/EditEmployee/Leave.vue
+++ b/src/modules/08_registryEmployee/components/EditEmployee/Leave.vue
@@ -1059,7 +1059,7 @@ const getClass = (val: boolean) => {
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
+                    
                     :borderless="!edit"
                     :model-value="dateThaiRange(dateRange)"
                     :rules="[(val:string) => !!val || `${'กรุณาเลือกวัน เดือน ปีที่ลา'}`]"
diff --git a/src/modules/08_registryEmployee/components/EditEmployee/Other.vue b/src/modules/08_registryEmployee/components/EditEmployee/Other.vue
index d523b638d..8a47e20c5 100644
--- a/src/modules/08_registryEmployee/components/EditEmployee/Other.vue
+++ b/src/modules/08_registryEmployee/components/EditEmployee/Other.vue
@@ -536,7 +536,7 @@ const getClass = (val: boolean) => {
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
+                 
                     :borderless="!edit"
                     :model-value="date2Thai(date)"
                     :rules="[(val) => !!val || `${'กรุณาเลือกวันที่'}`]"
diff --git a/src/modules/08_registryEmployee/components/EditEmployee/Record.vue b/src/modules/08_registryEmployee/components/EditEmployee/Record.vue
index d3dfaf37e..252bfce55 100644
--- a/src/modules/08_registryEmployee/components/EditEmployee/Record.vue
+++ b/src/modules/08_registryEmployee/components/EditEmployee/Record.vue
@@ -650,7 +650,6 @@ const resetFilter = () => {};
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(date)"
                     :rules="[(val) => !!val || `${'กรุณาเลือกวัน เดือน ปี'}`]"
@@ -747,7 +746,6 @@ const resetFilter = () => {};
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="
                       refCommandDate == null ? null : date2Thai(refCommandDate)
diff --git a/src/modules/08_registryEmployee/components/EditEmployee/Salary.vue b/src/modules/08_registryEmployee/components/EditEmployee/Salary.vue
index 4631417af..4ae0d95a5 100644
--- a/src/modules/08_registryEmployee/components/EditEmployee/Salary.vue
+++ b/src/modules/08_registryEmployee/components/EditEmployee/Salary.vue
@@ -1535,22 +1535,41 @@ const resetFilter = () => {};
       >
         <template #columns="props">
           <q-tr :props="props">
-            <q-td v-for="col in props.cols" :key="col.name" :props="props" @click="selectData(props)"
-              class="cursor-pointer">
+            <q-td
+              v-for="col in props.cols"
+              :key="col.name"
+              :props="props"
+              @click="selectData(props)"
+              class="cursor-pointer"
+            >
               <div v-if="col.name == 'date'" class="table_ellipsis">
                 {{ date2Thai(col.value) }}
               </div>
-              <div v-else-if="props.row.salaryStatus !== 'DEATH' && (
-                  col.name == 'positionSalaryAmount' ||
-                  col.name == 'mouthSalaryAmount' ||
-                  col.name == 'amount')
-                " class="table_ellipsis">
+              <div
+                v-else-if="
+                  props.row.salaryStatus !== 'DEATH' &&
+                  (col.name == 'positionSalaryAmount' ||
+                    col.name == 'mouthSalaryAmount' ||
+                    col.name == 'amount')
+                "
+                class="table_ellipsis"
+              >
                 {{ col.value == null ? "" : col.value.toLocaleString("en-US") }}
               </div>
-              <div v-else-if="props.row.salaryStatus === 'DEATH' && col.name == 'position'" class="table_ellipsis">
+              <div
+                v-else-if="
+                  props.row.salaryStatus === 'DEATH' && col.name == 'position'
+                "
+                class="table_ellipsis"
+              >
                 ถึงแก่กรรม
               </div>
-              <div v-else-if="props.row.salaryStatus === 'DEATH' && col.name !== 'salaryRef'" class="table_ellipsis">
+              <div
+                v-else-if="
+                  props.row.salaryStatus === 'DEATH' && col.name !== 'salaryRef'
+                "
+                class="table_ellipsis"
+              >
                 -
               </div>
               <div v-else class="table_ellipsis">
@@ -1660,7 +1679,6 @@ const resetFilter = () => {};
                             :class="getClass(edit)"
                             :outlined="edit"
                             dense
-                            lazy-rules
                             :borderless="!edit"
                             :model-value="date2Thai(date)"
                             :rules="[
diff --git a/src/modules/08_registryEmployee/components/EditEmployee/SalaryEmployee.vue b/src/modules/08_registryEmployee/components/EditEmployee/SalaryEmployee.vue
index 381acccd3..50db0ae6f 100644
--- a/src/modules/08_registryEmployee/components/EditEmployee/SalaryEmployee.vue
+++ b/src/modules/08_registryEmployee/components/EditEmployee/SalaryEmployee.vue
@@ -1618,7 +1618,6 @@ const resetFilter = () => {};
                             :class="getClass(edit)"
                             :outlined="edit"
                             dense
-                            lazy-rules
                             :borderless="!edit"
                             :model-value="date2Thai(date)"
                             :rules="[
diff --git a/src/modules/08_registryEmployee/components/EditEmployee/Train.vue b/src/modules/08_registryEmployee/components/EditEmployee/Train.vue
index 6a6bcf1ce..0876bb128 100644
--- a/src/modules/08_registryEmployee/components/EditEmployee/Train.vue
+++ b/src/modules/08_registryEmployee/components/EditEmployee/Train.vue
@@ -30,8 +30,15 @@ const store = useProfileDataStore();
 const { profileData, changeProfileColumns } = store;
 
 const mixin = useCounterMixin();
-const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader,dialogConfirm } =
-  mixin;
+const {
+  date2Thai,
+  success,
+  dateToISO,
+  messageError,
+  showLoader,
+  hideLoader,
+  dialogConfirm,
+} = mixin;
 const route = useRoute();
 const id = ref<string>("");
 const name = ref<string>();
@@ -476,8 +483,8 @@ const SaveData = async () => {
  * บันทึกเพิ่มข้อมูล
  */
 const clickSave = () => {
-  dialogConfirm($q,() => SaveData())
-}
+  dialogConfirm($q, () => SaveData());
+};
 const saveData = async () => {
   if (profileId.value) {
     showLoader();
@@ -792,9 +799,7 @@ const getClass = (val: boolean) => {
         <DialogHeader tittle="การฝึกอบรม/ดูงาน" :close="clickClose" />
         <q-separator />
         <q-card-section class="q-p-sm">
-          <div
-            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
-          >
+          <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
                 :class="getClass(edit)"
@@ -851,7 +856,6 @@ const getClass = (val: boolean) => {
                     hide-bottom-space
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(startDate)"
                     :rules="[
@@ -944,7 +948,6 @@ const getClass = (val: boolean) => {
                     hide-bottom-space
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="yearly + 543"
                     :rules="[(val) => !!val || `${'กรุณาเลือกปีงบประมาณ'}`]"
@@ -1047,7 +1050,6 @@ const getClass = (val: boolean) => {
                     hide-bottom-space
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(dateOrder)"
                     :label="`${'คำสั่งลงวันที่/หนังสืออนุมัติลงวันที่'}`"
diff --git a/src/modules/08_registryEmployee/components/EditEmployee/Work.vue b/src/modules/08_registryEmployee/components/EditEmployee/Work.vue
index 5d66ae88c..715849bec 100644
--- a/src/modules/08_registryEmployee/components/EditEmployee/Work.vue
+++ b/src/modules/08_registryEmployee/components/EditEmployee/Work.vue
@@ -30,8 +30,15 @@ const store = useProfileDataStore();
 const { profileData, changeProfileColumns } = store;
 
 const mixin = useCounterMixin();
-const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader,dialogConfirm } =
-  mixin;
+const {
+  date2Thai,
+  success,
+  dateToISO,
+  messageError,
+  showLoader,
+  hideLoader,
+  dialogConfirm,
+} = mixin;
 const route = useRoute();
 const id = ref<string>("");
 const dateStart = ref<Date>(new Date());
@@ -353,11 +360,11 @@ const clickAdd = async () => {
 /**
  * กดบันทึกใน dialog
  */
- const clickSave =  () => {
-  dialogConfirm($q,() => SaveData())
- }
+const clickSave = () => {
+  dialogConfirm($q, () => SaveData());
+};
 const SaveData = async () => {
- await myForm.value.validate().then(async (result: boolean) => {
+  await myForm.value.validate().then(async (result: boolean) => {
     if (result) {
       if (modalEdit.value) {
         await editData();
@@ -666,9 +673,7 @@ const resetFilter = () => {};
         <DialogHeader tittle="ปฏิบัติราชการพิเศษ" :close="clickClose" />
         <q-separator />
         <q-card-section class="q-p-sm">
-          <div
-            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
-          >
+          <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
                 menu-class-name="modalfix"
@@ -689,7 +694,6 @@ const resetFilter = () => {};
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(dateStart)"
                     :rules="[(val) => !!val || `${'กรุณาเลือกวันที่เริ่มต้น'}`]"
@@ -733,7 +737,6 @@ const resetFilter = () => {};
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="date2Thai(dateEnd)"
                     :rules="[(val) => !!val || `${'กรุณาเลือกวันที่สิ้นสุด'}`]"
@@ -830,7 +833,6 @@ const resetFilter = () => {};
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :borderless="!edit"
                     :model-value="
                       refCommandDate == null ? null : date2Thai(refCommandDate)
diff --git a/src/modules/08_registryEmployee/views/EditDetail.vue b/src/modules/08_registryEmployee/views/EditDetail.vue
index fc830579b..831555da4 100644
--- a/src/modules/08_registryEmployee/views/EditDetail.vue
+++ b/src/modules/08_registryEmployee/views/EditDetail.vue
@@ -759,7 +759,6 @@ const Retire = async () => {
                   class="full-width inputgreen cursor-pointer"
                   outlined
                   dense
-                  lazy-rules
                   :model-value="date2Thai(leaveDate)"
                   :rules="[(val) => !!val || `${'กรุณาเลือกวันที่พ้นราชการ'}`]"
                   hide-bottom-space
@@ -824,7 +823,6 @@ const Retire = async () => {
                   class="full-width inputgreen cursor-pointer"
                   outlined
                   dense
-                  lazy-rules
                   :model-value="date2Thai(leaveDateOrder)"
                   :rules="[(val) => !!val || `${'กรุณาเลือกวันที่ออกคำสั่ง'}`]"
                   hide-bottom-space
diff --git a/src/modules/09_leave/components/1_Work/DialogReport.vue b/src/modules/09_leave/components/1_Work/DialogReport.vue
index cb670d2a6..f112563a8 100644
--- a/src/modules/09_leave/components/1_Work/DialogReport.vue
+++ b/src/modules/09_leave/components/1_Work/DialogReport.vue
@@ -226,7 +226,6 @@ watch(
                     class="bg-white"
                     outlined
                     dense
-                    lazy-rules
                     borderless
                     :model-value="date ? date2Thai(date) : null"
                     :label="`${'วันที่'}`"
@@ -261,7 +260,6 @@ watch(
                     class="bg-white"
                     outlined
                     dense
-                    lazy-rules
                     borderless
                     :label="`${'เดือน'}`"
                     :model-value="monthYearThai(dateMonth)"
diff --git a/src/modules/09_leave/components/1_Work/ToolBar.vue b/src/modules/09_leave/components/1_Work/ToolBar.vue
index 16c881267..6f9ed5b28 100644
--- a/src/modules/09_leave/components/1_Work/ToolBar.vue
+++ b/src/modules/09_leave/components/1_Work/ToolBar.vue
@@ -95,7 +95,6 @@ function calculateMaxDate() {
             for="selectDate"
             dense
             outlined
-            lazy-rules
             :model-value="
               workStore.selectDate !== null
                 ? date2Thai(workStore.selectDate)
diff --git a/src/modules/09_leave/components/1_Work/ToolBarDate.vue b/src/modules/09_leave/components/1_Work/ToolBarDate.vue
index aa44960ac..d8ae9cba8 100644
--- a/src/modules/09_leave/components/1_Work/ToolBarDate.vue
+++ b/src/modules/09_leave/components/1_Work/ToolBarDate.vue
@@ -63,7 +63,6 @@ function filterFn() {
             for="selectDate"
             dense
             outlined
-            lazy-rules
             :model-value="
               workStore.selectDate !== null
                 ? date2Thai(workStore.selectDate)
diff --git a/src/modules/09_leave/components/2_Leave/ToolBarLeave.vue b/src/modules/09_leave/components/2_Leave/ToolBarLeave.vue
index 8b0ccd679..b43173c28 100644
--- a/src/modules/09_leave/components/2_Leave/ToolBarLeave.vue
+++ b/src/modules/09_leave/components/2_Leave/ToolBarLeave.vue
@@ -170,7 +170,6 @@ onMounted(async () => {
         <template #trigger>
           <q-input
             dense
-            lazy-rules
             outlined
             :model-value="Number(leaveStore.filter.year) + 543"
             :label="`${'ปีงบประมาณ'}`"
diff --git a/src/modules/09_leave/components/3_Report/LeaveReport.vue b/src/modules/09_leave/components/3_Report/LeaveReport.vue
index a0acab875..0d01d98c9 100644
--- a/src/modules/09_leave/components/3_Report/LeaveReport.vue
+++ b/src/modules/09_leave/components/3_Report/LeaveReport.vue
@@ -316,7 +316,6 @@ onMounted(() => {
               <q-input
                 class="bg-white"
                 dense
-                lazy-rules
                 outlined
                 :model-value="Number(year) + 543"
                 :label="`${'ปีงบประมาณ'}`"
@@ -352,7 +351,6 @@ onMounted(() => {
                 class="bg-white"
                 outlined
                 dense
-                lazy-rules
                 borderless
                 :model-value="dateStart ? date2Thai(dateStart) : null"
                 :label="`${'ตั้งเเต่วันที่'}`"
@@ -385,7 +383,6 @@ onMounted(() => {
                 class="bg-white"
                 outlined
                 dense
-                lazy-rules
                 borderless
                 :model-value="dateEnd ? date2Thai(dateEnd) : null"
                 :label="`${'ถึงวันที่'}`"
diff --git a/src/modules/09_leave/components/4_ChangeRound/DialogForm.vue b/src/modules/09_leave/components/4_ChangeRound/DialogForm.vue
index a44065d93..01dec13b6 100644
--- a/src/modules/09_leave/components/4_ChangeRound/DialogForm.vue
+++ b/src/modules/09_leave/components/4_ChangeRound/DialogForm.vue
@@ -299,7 +299,6 @@ watch(
                       :rules="[
                         (val) => !!val || `${'กรุณาเลือกวันที่ให้มีผล'}`,
                       ]"
-                      lazy-rules
                     >
                       <template v-slot:prepend>
                         <q-icon
diff --git a/src/modules/09_leave/components/4_specialTime/DialogApprove.vue b/src/modules/09_leave/components/4_specialTime/DialogApprove.vue
index d45ae5884..90f499b26 100644
--- a/src/modules/09_leave/components/4_specialTime/DialogApprove.vue
+++ b/src/modules/09_leave/components/4_specialTime/DialogApprove.vue
@@ -211,7 +211,6 @@ watch(
                   dense
                   outlined
                   readonly
-                  lazy-rules
                   :model-value="props.dateFix"
                   hide-bottom-space
                   :label="`${'วันที่ขอแก้ไข'}`"
diff --git a/src/modules/09_leave/components/4_specialTime/Table.vue b/src/modules/09_leave/components/4_specialTime/Table.vue
index 866882af7..05a759502 100644
--- a/src/modules/09_leave/components/4_specialTime/Table.vue
+++ b/src/modules/09_leave/components/4_specialTime/Table.vue
@@ -108,7 +108,6 @@ function resetFilter() {
             for="selectDate"
             dense
             outlined
-            lazy-rules
             :model-value="
               SpecialTimeStore.selectDate !== null
                 ? date2Thai(SpecialTimeStore.selectDate)
diff --git a/src/modules/10_order/components/PopupHistory.vue b/src/modules/10_order/components/PopupHistory.vue
index b98cb7bf9..27bdda47b 100644
--- a/src/modules/10_order/components/PopupHistory.vue
+++ b/src/modules/10_order/components/PopupHistory.vue
@@ -130,7 +130,7 @@ const clickSearch = async () => {
 };
 // Redirect to ทะเบียนประวัติ
 const clickRedirect = (id: string) => {
-  window.open(`/registry/${id}`, '_blank');
+  window.open(`/registry/${id}`, "_blank");
 };
 const paging = ref<boolean>(true);
 const pagination = ref({
@@ -151,7 +151,6 @@ function onclickViewinfo(id: string) {
 function updatemodalPersonal(modal: boolean) {
   modalPersonal.value = modal;
 }
-
 </script>
 
 <template>
@@ -233,7 +232,6 @@ function updatemodalPersonal(modal: boolean) {
                         hide-bottom-space
                         outlined
                         dense
-                        lazy-rules
                         borderless
                         :model-value="
                           reportYear == null ? null : reportYear + 543
diff --git a/src/modules/11_discipline/components/5_Report/DetailPage.vue b/src/modules/11_discipline/components/5_Report/DetailPage.vue
index c307c5a8f..51ee01742 100644
--- a/src/modules/11_discipline/components/5_Report/DetailPage.vue
+++ b/src/modules/11_discipline/components/5_Report/DetailPage.vue
@@ -14,7 +14,7 @@ const typeReport = route.params.type.toString();
 
 const store = useReportDataStore();
 const mixin = useCounterMixin();
-const {  date2Thai } = mixin;
+const { date2Thai } = mixin;
 const { filterFnOptionsType } = store;
 
 const $q = useQuasar();
@@ -28,33 +28,33 @@ const titleReport = ref<string>("");
 const splitterModel = ref(14);
 
 /** กลับหน้าหลัก */
-function backHistory(){
+function backHistory() {
   window.history.back();
-};
+}
 
 /** แสดงรายงาน */
-function showDocument(url: any){
+function showDocument(url: any) {
   const pdfData = usePDF(url);
 
   setTimeout(() => {
     pdfSrc.value = pdfData.pdf.value;
     numOfPages.value = pdfData.pages.value;
   }, 1000);
-};
+}
 
 /** ไปหน้าต่อไปของรายงาน */
-function nextPage(){
+function nextPage() {
   if (page.value < numOfPages.value) {
     page.value++;
   }
-};
+}
 
 /** กลับหน้าก่อนหน้าของรายงาน */
-function backPage(){
+function backPage() {
   if (page.value !== 1) {
     page.value--;
   }
-};
+}
 
 /** โหลดข้อมูลเมื่อเข้าหน้านี้ */
 onMounted(async () => {
@@ -98,7 +98,6 @@ onMounted(async () => {
                   class="full-width inputgreen cursor-pointer"
                   outlined
                   dense
-                  lazy-rules
                   borderless
                   :model-value="date ? date2Thai(date) : null"
                   :label="`${'ตั้งเเต่วันที่'}`"
@@ -110,7 +109,6 @@ onMounted(async () => {
                 </q-input>
               </template>
             </datepicker>
-
           </div>
           <div class="q-pl-xs">
             <datepicker
@@ -130,7 +128,6 @@ onMounted(async () => {
                   class="full-width inputgreen cursor-pointer"
                   outlined
                   dense
-                  lazy-rules
                   borderless
                   :model-value="dateEnd ? date2Thai(dateEnd) : null"
                   :label="`${'ถึงวันที่'}`"
@@ -142,7 +139,6 @@ onMounted(async () => {
                 </q-input>
               </template>
             </datepicker>
-
           </div>
           <q-space />
           <div class="q-py-xs">
@@ -182,7 +178,6 @@ onMounted(async () => {
                 </q-item>
               </template>
             </q-select>
-
           </div>
           <div class="q-pl-xs">
             <q-select
@@ -208,7 +203,6 @@ onMounted(async () => {
                 </q-item>
               </template>
             </q-select>
-
           </div>
           <div v-if="typeReport > '2'" class="q-pl-xs">
             <q-select
@@ -234,7 +228,6 @@ onMounted(async () => {
                 </q-item>
               </template>
             </q-select>
-
           </div>
         </q-toolbar>
         <q-splitter
@@ -262,7 +255,6 @@ onMounted(async () => {
                     @click="backPage"
                     :disable="page == 1"
                   />
-
                 </div>
                 <div class="col-12 col-md-auto">
                   <div class="q-pa-md flex">
@@ -279,7 +271,6 @@ onMounted(async () => {
                     @click="nextPage"
                     :disable="page === numOfPages"
                   />
-
                 </div>
               </div>
             </div>
diff --git a/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue b/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue
index f887a8dd3..9b37b8ac4 100644
--- a/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue
+++ b/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue
@@ -13,7 +13,7 @@ import { useDisciplineSuspendStore } from "@/modules/11_discipline/store/Suspend
 import type { QForm } from "quasar";
 import type { dataDetail } from "@/modules/11_discipline/interface/response/suspend";
 import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
-  
+
 const modalPersonal = ref<boolean>(false);
 const personId = ref<string>("");
 /** use */
@@ -64,7 +64,7 @@ const data = reactive<dataDetail>({
 });
 
 /**นำข้อมูลจาก API มาแสดง */
-async function getData(){
+async function getData() {
   showLoader();
   await http
     .get(config.API.suspendById(dataId))
@@ -92,7 +92,7 @@ async function getData(){
       data.offenseDetails = dataGet.offenseDetails;
       data.disciplinaryFaultLevel = dataGet.disciplinaryFaultLevel;
       data.disciplinaryCaseFault = dataGet.disciplinaryCaseFault;
-      getAvatar(dataGet.personId)
+      getAvatar(dataGet.personId);
     })
     .catch((e) => {
       messageError($q, e);
@@ -100,39 +100,37 @@ async function getData(){
     .finally(() => {
       hideLoader();
     });
-};
+}
 
 /**
  * ฟังชั่น ดึงรูปภาพโปรไฟล์
  * @param id id ของบุคคล
  */
-function getAvatar(id:string){
-  if(id){
+function getAvatar(id: string) {
+  if (id) {
     http
-    .get(config.API.profileAvaId(id))
-    .then((res)=>{
-      console.log(res)
-      const dataList = res.data.result
-      data.avatar = dataList.avatar
-    }).catch((e)=>{
-
-    }).finally(()=>{
-      
-    })
+      .get(config.API.profileAvaId(id))
+      .then((res) => {
+        console.log(res);
+        const dataList = res.data.result;
+        data.avatar = dataList.avatar;
+      })
+      .catch((e) => {})
+      .finally(() => {});
   }
 }
 /**
  * ฟังก์ชั่น Cancle
  */
- async function clickCancel(){
+async function clickCancel() {
   await getData();
   edit.value = false;
-};
+}
 
 /**
  * ฟังก์ชั่น Save
  */
- async function conditionSave(){
+async function conditionSave() {
   if (myForm.value !== null) {
     myForm.value.validate().then((success) => {
       if (success) {
@@ -149,12 +147,12 @@ function getAvatar(id:string){
       }
     });
   }
-};
+}
 
 /**
  * ฟังก์ชั่น Saveจาก API
  */
- async function saveData(){
+async function saveData() {
   const body = {
     organization: data.organization,
     position: data.position,
@@ -179,18 +177,18 @@ function getAvatar(id:string){
       await getData();
       hideLoader();
     });
-};
+}
 
 /**
  * Function เพิ่ม Class เวลา Edit
  * @param val เมื่อเป็นEdit จะเปลี่ยน Class
  */
-function getClass(val: boolean){
+function getClass(val: boolean) {
   return {
     "full-width inputgreen cursor-pointer": val,
     "full-width cursor-pointer": !val,
   };
-};
+}
 
 function onclickViewinfo(id: string) {
   modalPersonal.value = true;
@@ -211,7 +209,6 @@ function changeFormDataDate() {
   }
 }
 
-
 /** Hook */
 onMounted(async () => {
   if (keycloak.tokenParsed != null) {
@@ -254,7 +251,10 @@ onMounted(async () => {
     <div class="row col-12 q-pa-md">
       <div class="col-12 row bg-white q-col-gutter-md">
         <div class="col-xs-3 col-sm-2 col-md-1 row">
-          <q-img :src="data.avatar" v-if="data.avatar !== '' && data.avatar !== null" />
+          <q-img
+            :src="data.avatar"
+            v-if="data.avatar !== '' && data.avatar !== null"
+          />
           <q-img src="@/assets/avatar_user.jpg" v-else />
         </div>
         <div class="col-xs-6 col-sm-3 row items-center">
@@ -428,7 +428,6 @@ onMounted(async () => {
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :readonly="!edit"
                     :borderless="!edit"
                     :model-value="
@@ -468,7 +467,6 @@ onMounted(async () => {
                 :enableTimePicker="false"
                 week-start="0"
                 :min-date="data.startDateSuspend"
-                
               >
                 <template #year="{ year }">{{ year + 543 }}</template>
                 <template #year-overlay-value="{ value }">{{
@@ -479,7 +477,6 @@ onMounted(async () => {
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
-                    lazy-rules
                     :readonly="!edit || data.startDateSuspend === null"
                     :borderless="!edit"
                     :model-value="
@@ -490,7 +487,6 @@ onMounted(async () => {
                     :rules="[(val) => !!val || `${'กรุณาเลือกถึงวันที่'}`]"
                     hide-bottom-space
                     :label="`${'ถึงวันที่'}`"
-                    
                   >
                     <template v-slot:prepend>
                       <q-icon
diff --git a/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue b/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue
index 815118a8f..7d7d5c286 100644
--- a/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue
+++ b/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue
@@ -353,7 +353,6 @@ onMounted(async () => {
               <template #trigger>
                 <q-input
                   dense
-                  lazy-rules
                   outlined
                   :model-value="
                     formData.year === 0 ? null : Number(formData.year) + 543
diff --git a/src/modules/13_salary/components/Command/step01.vue b/src/modules/13_salary/components/Command/step01.vue
index 3072478c3..408ad6e7e 100644
--- a/src/modules/13_salary/components/Command/step01.vue
+++ b/src/modules/13_salary/components/Command/step01.vue
@@ -475,7 +475,7 @@ function fetchSalaryRound() {
               }}</template>
               <template #trigger>
                 <q-input
-                  lazy-rules
+               
                   class="inputgreen"
                   :model-value="dateYear !== null ? dateYear + 543 : null"
                   :rules="[(val) => !!val || `${'กรุณากรอก พ.ศ.'}`]"
@@ -508,7 +508,7 @@ function fetchSalaryRound() {
               <q-input
                 outlined
                 dense
-                lazy-rules
+              
                 class="inputgreen"
                 :model-value="
                   dateCommand != null ? date2Thai(dateCommand) : null
@@ -644,7 +644,7 @@ function fetchSalaryRound() {
             <template #trigger>
               <q-input
                 dense
-                lazy-rules
+                
                 outlined
                 :model-value="year === 0 ? null : Number(year) + 543"
                 :label="`${'ปีงบประมาณ'}`"
diff --git a/src/modules/13_salary/views/salaryEmployeeLists.vue b/src/modules/13_salary/views/salaryEmployeeLists.vue
index 2faad193a..5f9bdb519 100644
--- a/src/modules/13_salary/views/salaryEmployeeLists.vue
+++ b/src/modules/13_salary/views/salaryEmployeeLists.vue
@@ -342,7 +342,6 @@ onMounted(() => {
       <template #trigger>
         <q-input
           dense
-          lazy-rules
           outlined
           :model-value="Number(year) + 543"
           :label="`${'ปีงบประมาณ'}`"
diff --git a/src/modules/13_salary/views/salaryLists.vue b/src/modules/13_salary/views/salaryLists.vue
index a71cd73e4..524a17dcc 100644
--- a/src/modules/13_salary/views/salaryLists.vue
+++ b/src/modules/13_salary/views/salaryLists.vue
@@ -366,7 +366,6 @@ onMounted(async () => {
       <template #trigger>
         <q-input
           dense
-          lazy-rules
           outlined
           :model-value="Number(year) + 543"
           :label="`${'ปีงบประมาณ'}`"
diff --git a/src/modules/13_salary/views/salaryRound.vue b/src/modules/13_salary/views/salaryRound.vue
index 5c161da3f..e8c385ad6 100644
--- a/src/modules/13_salary/views/salaryRound.vue
+++ b/src/modules/13_salary/views/salaryRound.vue
@@ -253,7 +253,6 @@ watch(
           <template #trigger>
             <q-input
               dense
-              lazy-rules
               outlined
               :model-value="year === 0 ? null : Number(year) + 543"
               :label="`${'ปีงบประมาณ'}`"
diff --git a/src/modules/14_KPI/components/indicatorByPlan/IndicatorByPlan.vue b/src/modules/14_KPI/components/indicatorByPlan/IndicatorByPlan.vue
index fe8ac501c..3e68d2140 100644
--- a/src/modules/14_KPI/components/indicatorByPlan/IndicatorByPlan.vue
+++ b/src/modules/14_KPI/components/indicatorByPlan/IndicatorByPlan.vue
@@ -289,7 +289,6 @@ onMounted(() => {
             <template #trigger>
               <q-input
                 dense
-                lazy-rules
                 outlined
                 class="inputgreen"
                 hide-bottom-space
diff --git a/src/modules/14_KPI/views/indicatorByPlan.vue b/src/modules/14_KPI/views/indicatorByPlan.vue
index 4d94987d2..b263184df 100644
--- a/src/modules/14_KPI/views/indicatorByPlan.vue
+++ b/src/modules/14_KPI/views/indicatorByPlan.vue
@@ -175,10 +175,10 @@ async function deleteData(idData: string) {
   );
 }
 
-function clearFilter(){
-  nodeData.keyword = '' 
-  fetchActive() 
-  fetchRoundOption()
+function clearFilter() {
+  nodeData.keyword = "";
+  fetchActive();
+  fetchRoundOption();
 }
 onMounted(() => {
   fetchActive();
@@ -280,7 +280,6 @@ onMounted(() => {
                 <q-input
                   class="inputgreen"
                   dense
-                  lazy-rules
                   outlined
                   :model-value="year === 0 ? 'ทั้งหมด' : Number(year) + 543"
                   :label="`${'ปีงบประมาณ'}`"
diff --git a/src/modules/14_KPI/views/indicatorByRole.vue b/src/modules/14_KPI/views/indicatorByRole.vue
index 8f12a7161..48a7febca 100644
--- a/src/modules/14_KPI/views/indicatorByRole.vue
+++ b/src/modules/14_KPI/views/indicatorByRole.vue
@@ -294,7 +294,6 @@ onMounted(async () => {
           <template #trigger>
             <q-input
               dense
-              lazy-rules
               outlined
               class="inputgreen"
               :model-value="
diff --git a/src/modules/14_KPI/views/list.vue b/src/modules/14_KPI/views/list.vue
index 1d6872e28..e19428d66 100644
--- a/src/modules/14_KPI/views/list.vue
+++ b/src/modules/14_KPI/views/list.vue
@@ -203,7 +203,6 @@ onMounted(async () => {
               <template #trigger>
                 <q-input
                   dense
-                  lazy-rules
                   outlined
                   class="inputgreen"
                   hide-bottom-space
diff --git a/src/modules/14_KPI/views/round.vue b/src/modules/14_KPI/views/round.vue
index 7388825a4..1e1e92e8c 100644
--- a/src/modules/14_KPI/views/round.vue
+++ b/src/modules/14_KPI/views/round.vue
@@ -380,7 +380,6 @@ onMounted(() => {
           <template #trigger>
             <q-input
               dense
-              lazy-rules
               outlined
               :model-value="
                 formQuery.year === 0 ? 'ทั้งหมด' : Number(formQuery.year) + 543