diff --git a/src/modules/05_leave/components/FormLeave/01_SickForm.vue b/src/modules/05_leave/components/FormLeave/01_SickForm.vue
index 63e77e3..42ebfc1 100644
--- a/src/modules/05_leave/components/FormLeave/01_SickForm.vue
+++ b/src/modules/05_leave/components/FormLeave/01_SickForm.vue
@@ -15,14 +15,8 @@ const typeForm = defineModel<string>("type", { required: true });
 const $q = useQuasar();
 const dataStore = useLeaveStore();
 const mixin = useCounterMixin();
-const {
-  date2Thai,
-  dateToISO,
-  messageError,
-  convertDateToAPI,
-  showLoader,
-  hideLoader,
-} = mixin;
+const { date2Thai, messageError, convertDateToAPI, showLoader, hideLoader } =
+  mixin;
 const edit = ref<boolean>(true);
 const leaveDocumentRef = ref<any>(null);
 
@@ -200,22 +194,25 @@ const dateEndInputStyle = computed(() => {
 const leaveId = ref<any>("");
 /** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาที่ฟอร์มไหม เมื่อมีการส่งจะ map ข้อมูลเข้า v-model ของฟอร์ม */
 const statusCheck = ref<any>("");
-watch(props.data, () => {
-  if (props.data) {
-    // totalCheck.value = null;
-    formDataSick.leaveWrote = props.data.leaveWrote;
-    formDataSick.leaveStartDate = new Date(props.data.leaveStartDate);
-    formDataSick.leaveEndDate = new Date(props.data.leaveEndDate);
-    formDataSick.contractTel = props.data.contractTel;
-    formDataSick.leaveTotal = props.data.leaveTotal;
-    formDataSick.leaveDetail = props.data.leaveDetail;
-    formDataSick.leaveRange = props.data.leaveRange;
-    formDataSick.leaveRangeEnd = props.data.leaveRangeEnd;
-    leaveDocumentList.value = props.data.leaveDocument;
-    statusCheck.value = props.data.status;
-    formDataSick.leaveDocument = [];
+watch(
+  () => props.data,
+  () => {
+    if (props.data) {
+      // totalCheck.value = null;
+      formDataSick.leaveWrote = props.data.leaveWrote;
+      formDataSick.leaveStartDate = new Date(props.data.leaveStartDate);
+      formDataSick.leaveEndDate = new Date(props.data.leaveEndDate);
+      formDataSick.contractTel = props.data.contractTel;
+      formDataSick.leaveTotal = props.data.leaveTotal;
+      formDataSick.leaveDetail = props.data.leaveDetail;
+      formDataSick.leaveRange = props.data.leaveRange;
+      formDataSick.leaveRangeEnd = props.data.leaveRangeEnd;
+      leaveDocumentList.value = props.data.leaveDocument;
+      statusCheck.value = props.data.status;
+      formDataSick.leaveDocument = [];
+    }
   }
-});
+);
 
 /** Hook */
 onMounted(() => {
@@ -264,7 +261,6 @@ onMounted(() => {
           <div class="row q-col-gutter-sm">
             <div class="col-12 col-md-3 col-sm-6 inputgreen">
               <datepicker
-                menu-class-name="modalfix"
                 v-model="formDataSick.leaveStartDate"
                 :locale="'th'"
                 autoApply
@@ -342,7 +338,6 @@ onMounted(() => {
           <div class="row q-col-gutter-sm">
             <div class="col-12 col-md-3 col-sm-6 inputgreen">
               <datepicker
-                menu-class-name="modalfix"
                 v-model="formDataSick.leaveEndDate"
                 :locale="'th'"
                 autoApply
diff --git a/src/modules/05_leave/components/FormLeave/03_Birth.vue b/src/modules/05_leave/components/FormLeave/03_Birth.vue
index b10b05b..ce3533b 100644
--- a/src/modules/05_leave/components/FormLeave/03_Birth.vue
+++ b/src/modules/05_leave/components/FormLeave/03_Birth.vue
@@ -205,20 +205,23 @@ const dateEndInputStyle = computed(() => {
 /** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาที่ฟอร์มไหม เมื่อมีการส่งจะ map ข้อมูลเข้า v-model ของฟอร์ม */
 const leaveDocumentList = ref<any>();
 const statusCheck = ref<any>("");
-watch(props.data, () => {
-  if (props.data) {
-    // totalCheck.value = null;
-    formDataBirth.leaveWrote = props.data.leaveWrote;
-    formDataBirth.leaveStartDate = props.data.leaveStartDate;
-    formDataBirth.leaveEndDate = props.data.leaveEndDate;
-    formDataBirth.leaveTotal = props.data.leaveTotal;
-    formDataBirth.leaveDetail = props.data.leaveDetail;
-    formDataBirth.leaveRangeEnd = props.data.leaveRangeEnd;
-    leaveDocumentList.value = props.data.leaveDocument;
-    statusCheck.value = props.data.status;
-    formDataBirth.leaveDocument = [];
+watch(
+  () => props.data,
+  () => {
+    if (props.data) {
+      // totalCheck.value = null;
+      formDataBirth.leaveWrote = props.data.leaveWrote;
+      formDataBirth.leaveStartDate = props.data.leaveStartDate;
+      formDataBirth.leaveEndDate = props.data.leaveEndDate;
+      formDataBirth.leaveTotal = props.data.leaveTotal;
+      formDataBirth.leaveDetail = props.data.leaveDetail;
+      formDataBirth.leaveRangeEnd = props.data.leaveRangeEnd;
+      leaveDocumentList.value = props.data.leaveDocument;
+      statusCheck.value = props.data.status;
+      formDataBirth.leaveDocument = [];
+    }
   }
-});
+);
 
 /** Hook */
 onMounted(() => {
@@ -266,7 +269,6 @@ onMounted(() => {
           <div class="row q-col-gutter-sm">
             <div class="col-12 col-md-3 col-sm-6 inputgreen">
               <datepicker
-                menu-class-name="modalfix"
                 v-model="formDataBirth.leaveStartDate"
                 :locale="'th'"
                 autoApply
@@ -344,7 +346,6 @@ onMounted(() => {
           <div class="row q-col-gutter-sm">
             <div class="col-12 col-md-3 col-sm-6 inputgreen">
               <datepicker
-                menu-class-name="modalfix"
                 v-model="formDataBirth.leaveEndDate"
                 :locale="'th'"
                 autoApply
diff --git a/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue b/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue
index 358ef09..e3e29fe 100644
--- a/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue
+++ b/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue
@@ -205,23 +205,26 @@ async function fetchCheck() {
 
 /** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาที่ฟอร์มไหม เมื่อมีการส่งจะ map ข้อมูลเข้า v-model ของฟอร์ม */
 
-watch(props.data, async () => {
-  if (props.data) {
-    // totalCheck.value = null;
-    formDataHelpWife.leaveWrote = props.data.leaveWrote;
-    formDataHelpWife.wifeDayName = props.data.wifeDayName;
-    formDataHelpWife.wifeDayDateBorn = props.data.wifeDayDateBorn;
-    formDataHelpWife.leaveStartDate = props.data.leaveStartDate;
-    formDataHelpWife.leaveEndDate = props.data.leaveEndDate;
-    formDataHelpWife.leaveTotal = props.data.leaveTotal;
-    formDataHelpWife.leaveRangeEnd = props.data.leaveRangeEnd;
-    formDataHelpWife.leaveRange = props.data.leaveRange;
-    formDataHelpWife.leaveDetail = props.data.leaveDetail;
-    formDataHelpWife.leaveDocument = [];
-    leaveDocumentList.value = props.data.leaveDocument;
-    statusCheck.value = props.data.status;
+watch(
+  () => props.data,
+  async () => {
+    if (props.data) {
+      // totalCheck.value = null;
+      formDataHelpWife.leaveWrote = props.data.leaveWrote;
+      formDataHelpWife.wifeDayName = props.data.wifeDayName;
+      formDataHelpWife.wifeDayDateBorn = props.data.wifeDayDateBorn;
+      formDataHelpWife.leaveStartDate = props.data.leaveStartDate;
+      formDataHelpWife.leaveEndDate = props.data.leaveEndDate;
+      formDataHelpWife.leaveTotal = props.data.leaveTotal;
+      formDataHelpWife.leaveRangeEnd = props.data.leaveRangeEnd;
+      formDataHelpWife.leaveRange = props.data.leaveRange;
+      formDataHelpWife.leaveDetail = props.data.leaveDetail;
+      formDataHelpWife.leaveDocument = [];
+      leaveDocumentList.value = props.data.leaveDocument;
+      statusCheck.value = props.data.status;
+    }
   }
-});
+);
 
 /**Hook */
 onMounted(async () => {
@@ -270,7 +273,6 @@ onMounted(async () => {
           <div class="row q-col-gutter-sm">
             <div class="col-12 col-md-3 col-sm-6 inputgreen">
               <datepicker
-                menu-class-name="modalfix"
                 v-model="formDataHelpWife.leaveStartDate"
                 :locale="'th'"
                 autoApply
@@ -348,7 +350,6 @@ onMounted(async () => {
           <div class="row q-col-gutter-sm">
             <div class="col-12 col-md-3 col-sm-6 inputgreen">
               <datepicker
-                menu-class-name="modalfix"
                 v-model="formDataHelpWife.leaveEndDate"
                 :locale="'th'"
                 autoApply
@@ -466,7 +467,6 @@ onMounted(async () => {
 
         <div class="col-12 col-md-4 col-sm-12 inputgreen">
           <datepicker
-            menu-class-name="modalfix"
             v-model="formDataHelpWife.wifeDayDateBorn"
             :locale="'th'"
             autoApply
diff --git a/src/modules/05_leave/components/FormLeave/05_VacationForm.vue b/src/modules/05_leave/components/FormLeave/05_VacationForm.vue
index 90ed483..8603957 100644
--- a/src/modules/05_leave/components/FormLeave/05_VacationForm.vue
+++ b/src/modules/05_leave/components/FormLeave/05_VacationForm.vue
@@ -203,24 +203,27 @@ async function fetchCheck() {
   }
 }
 
-watch(props.data, () => {
-  if (props.data) {
-    // totalCheck.value = null;
-    formDataVacation.leaveWrote = props.data.leaveWrote;
-    formDataVacation.restDayOldTotal = props.data.restDayOldTotal;
-    formDataVacation.restDayCurrentTotal = props.data.restDayCurrentTotal;
-    formDataVacation.leaveStartDate = props.data.leaveStartDate;
-    formDataVacation.leaveEndDate = props.data.leaveEndDate;
-    formDataVacation.leaveTotal = props.data.leaveTotal;
+watch(
+  () => props.data,
+  () => {
+    if (props.data) {
+      // totalCheck.value = null;
+      formDataVacation.leaveWrote = props.data.leaveWrote;
+      formDataVacation.restDayOldTotal = props.data.restDayOldTotal;
+      formDataVacation.restDayCurrentTotal = props.data.restDayCurrentTotal;
+      formDataVacation.leaveStartDate = props.data.leaveStartDate;
+      formDataVacation.leaveEndDate = props.data.leaveEndDate;
+      formDataVacation.leaveTotal = props.data.leaveTotal;
 
-    formDataVacation.leaveDetail = props.data.leaveDetail;
-    formDataVacation.leaveRangeEnd = props.data.leaveRangeEnd;
-    leaveDocumentList.value = props.data.leaveDocument;
-    statusCheck.value = props.data.status;
-    formDataVacation.leaveRange = props.data.leaveRange;
-    formDataVacation.leaveDocument = [];
+      formDataVacation.leaveDetail = props.data.leaveDetail;
+      formDataVacation.leaveRangeEnd = props.data.leaveRangeEnd;
+      leaveDocumentList.value = props.data.leaveDocument;
+      statusCheck.value = props.data.status;
+      formDataVacation.leaveRange = props.data.leaveRange;
+      formDataVacation.leaveDocument = [];
+    }
   }
-});
+);
 
 /**Hook */
 onMounted(() => {
@@ -270,7 +273,6 @@ onMounted(() => {
           <div class="row q-col-gutter-sm">
             <div class="col-12 col-md-3 col-sm-6 inputgreen">
               <datepicker
-                menu-class-name="modalfix"
                 v-model="formDataVacation.leaveStartDate"
                 :locale="'th'"
                 autoApply
@@ -347,7 +349,6 @@ onMounted(() => {
           <div class="row q-col-gutter-sm">
             <div class="col-12 col-md-3 col-sm-6 inputgreen">
               <datepicker
-                menu-class-name="modalfix"
                 v-model="formDataVacation.leaveEndDate"
                 :locale="'th'"
                 autoApply
diff --git a/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue b/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue
index ce9394d..64eeb67 100644
--- a/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue
+++ b/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue
@@ -229,32 +229,36 @@ const dateEndInputStyle = computed(() => {
 const leaveDocumentList = ref<any>();
 const statusCheck = ref<string>("");
 
-watch(props.data, async () => {
-  if (props.data) {
-    // totalCheck.value = null;
-    formDataOrdination.leaveWrote = props.data.leaveWrote;
-    formDataOrdination.leaveStartDate = props.data.leaveStartDate;
-    formDataOrdination.leaveEndDate = props.data.leaveEndDate;
-    formDataOrdination.leaveTotal = props.data.leaveTotal;
-    formDataOrdination.ordainDayOrdination = props.data.ordainDayOrdination;
-    formDataOrdination.ordainDayLocationName = props.data.ordainDayLocationName;
-    formDataOrdination.ordainDayLocationAddress =
-      props.data.ordainDayLocationAddress;
-    formDataOrdination.ordainDayBuddhistLentName =
-      props.data.ordainDayBuddhistLentName;
-    formDataOrdination.ordainDayBuddhistLentAddress =
-      props.data.ordainDayBuddhistLentAddress;
-    formDataOrdination.ordainDayStatus = props.data.ordainDayStatus;
-    formDataOrdination.leaveDetail = props.data.leaveDetail;
-    leaveDocumentList.value = props.data.leaveDocument;
-    formDataOrdination.ordainDayLocationNumber =
-      props.data.ordainDayLocationNumber;
-    formDataOrdination.leaveRange = props.data.leaveRange;
-    formDataOrdination.leaveRangeEnd = props.data.leaveRangeEnd;
-    statusCheck.value = props.data.status;
-    formDataOrdination.leaveDocument = [];
+watch(
+  () => props.data,
+  async () => {
+    if (props.data) {
+      // totalCheck.value = null;
+      formDataOrdination.leaveWrote = props.data.leaveWrote;
+      formDataOrdination.leaveStartDate = props.data.leaveStartDate;
+      formDataOrdination.leaveEndDate = props.data.leaveEndDate;
+      formDataOrdination.leaveTotal = props.data.leaveTotal;
+      formDataOrdination.ordainDayOrdination = props.data.ordainDayOrdination;
+      formDataOrdination.ordainDayLocationName =
+        props.data.ordainDayLocationName;
+      formDataOrdination.ordainDayLocationAddress =
+        props.data.ordainDayLocationAddress;
+      formDataOrdination.ordainDayBuddhistLentName =
+        props.data.ordainDayBuddhistLentName;
+      formDataOrdination.ordainDayBuddhistLentAddress =
+        props.data.ordainDayBuddhistLentAddress;
+      formDataOrdination.ordainDayStatus = props.data.ordainDayStatus;
+      formDataOrdination.leaveDetail = props.data.leaveDetail;
+      leaveDocumentList.value = props.data.leaveDocument;
+      formDataOrdination.ordainDayLocationNumber =
+        props.data.ordainDayLocationNumber;
+      formDataOrdination.leaveRange = props.data.leaveRange;
+      formDataOrdination.leaveRangeEnd = props.data.leaveRangeEnd;
+      statusCheck.value = props.data.status;
+      formDataOrdination.leaveDocument = [];
+    }
   }
-});
+);
 
 /** Hook */
 onMounted(async () => {
@@ -320,7 +324,6 @@ onMounted(async () => {
           <div class="row q-col-gutter-sm">
             <div class="col-12 col-md-3 col-sm-6 inputgreen">
               <datepicker
-                menu-class-name="modalfix"
                 v-model="formDataOrdination.leaveStartDate"
                 :locale="'th'"
                 autoApply
@@ -398,7 +401,6 @@ onMounted(async () => {
           <div class="row q-col-gutter-sm">
             <div class="col-12 col-md-3 col-sm-6 inputgreen">
               <datepicker
-                menu-class-name="modalfix"
                 v-model="formDataOrdination.leaveEndDate"
                 :locale="'th'"
                 autoApply
@@ -497,7 +499,6 @@ onMounted(async () => {
 
             <div class="col-12 col-md-3 col-sm-6">
               <datepicker
-                menu-class-name="modalfix"
                 v-model="formDataOrdination.leavegovernmentDate"
                 :locale="'th'"
                 autoApply
@@ -543,7 +544,6 @@ onMounted(async () => {
 
             <div class="col-12 col-md-3 col-sm-6">
               <datepicker
-                menu-class-name="modalfix"
                 v-model="formDataOrdination.leavebirthDate"
                 :locale="'th'"
                 autoApply
@@ -614,7 +614,6 @@ onMounted(async () => {
         <div class="text-weight-bold text-dark col-12">สถานที่บวช</div>
         <div class="col-12 col-md-4 col-sm-6 inputgreen">
           <datepicker
-            menu-class-name="modalfix"
             v-model="formDataOrdination.ordainDayOrdination"
             :locale="'th'"
             autoApply
diff --git a/src/modules/05_leave/components/FormLeave/07_HajjForm.vue b/src/modules/05_leave/components/FormLeave/07_HajjForm.vue
index c630c62..b19441c 100644
--- a/src/modules/05_leave/components/FormLeave/07_HajjForm.vue
+++ b/src/modules/05_leave/components/FormLeave/07_HajjForm.vue
@@ -122,7 +122,7 @@ function onValidate() {
     formData.append("leaveTotal", formDataHaji.leaveTotal);
     formData.append("leaveRange", formDataHaji.leaveRange);
     formData.append("leaveRangeEnd", formDataHaji.leaveRangeEnd);
-    formData.append("hajj", 'true');
+    formData.append("hajj", "true");
     props.onSubmit(formData, isLeave.value);
   }
 }
@@ -193,22 +193,25 @@ const dateEndInputStyle = computed(() => {
 /** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาที่ฟอร์มไหม เมื่อมีการส่งจะ map ข้อมูลเข้า v-model ของฟอร์ม */
 const leaveDocumentList = ref<any>();
 const statusCheck = ref<any>("");
-watch(props.data, async () => {
-  if (props.data) {
-    // totalCheck.value = null;
-    formDataHaji.leaveWrote = props.data.leaveWrote;
-    formDataHaji.leaveTotal = props.data.leaveTotal;
-    formDataHaji.leaveStartDate = props.data.leaveStartDate;
-    formDataHaji.leaveEndDate = props.data.leaveEndDate;
-    formDataHaji.hajjDayStatus = props.data.hajjDayStatus;
-    formDataHaji.leaveDetail = props.data.leaveDetail;
-    formDataHaji.leaveRangeEnd = props.data.leaveRangeEnd;
-    formDataHaji.leaveRange = props.data.leaveRange;
-    leaveDocumentList.value = props.data.leaveDocument;
-    statusCheck.value = props.data.status;
-    formDataHaji.leaveDocument = [];
+watch(
+  () => props.data,
+  async () => {
+    if (props.data) {
+      // totalCheck.value = null;
+      formDataHaji.leaveWrote = props.data.leaveWrote;
+      formDataHaji.leaveTotal = props.data.leaveTotal;
+      formDataHaji.leaveStartDate = props.data.leaveStartDate;
+      formDataHaji.leaveEndDate = props.data.leaveEndDate;
+      formDataHaji.hajjDayStatus = props.data.hajjDayStatus;
+      formDataHaji.leaveDetail = props.data.leaveDetail;
+      formDataHaji.leaveRangeEnd = props.data.leaveRangeEnd;
+      formDataHaji.leaveRange = props.data.leaveRange;
+      leaveDocumentList.value = props.data.leaveDocument;
+      statusCheck.value = props.data.status;
+      formDataHaji.leaveDocument = [];
+    }
   }
-});
+);
 
 /**Hook */
 onMounted(async () => {
@@ -255,7 +258,6 @@ onMounted(async () => {
           <div class="row q-col-gutter-sm">
             <datepicker
               class="col-12 col-md-3 col-sm-6 inputgreen"
-              menu-class-name="modalfix"
               v-model="formDataHaji.leaveStartDate"
               :locale="'th'"
               autoApply
@@ -329,7 +331,6 @@ onMounted(async () => {
           <div class="row q-col-gutter-sm">
             <datepicker
               class="col-12 col-md-3 col-sm-6 inputgreen"
-              menu-class-name="modalfix"
               v-model="formDataHaji.leaveEndDate"
               :locale="'th'"
               autoApply
@@ -425,7 +426,6 @@ onMounted(async () => {
 
             <datepicker
               class="col-12 col-md-3 col-sm-6"
-              menu-class-name="modalfix"
               autoApply
               borderless
               readonly
diff --git a/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue b/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue
index ff7be45..9f1d176 100644
--- a/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue
+++ b/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue
@@ -215,31 +215,34 @@ async function fetchCheck() {
 //   formDataMilitary.leaveTotal = newLeaveTotal;
 // }
 
-watch(props.data, async () => {
-  if (props.data) {
-    // totalCheck.value = null;
-    formDataMilitary.leaveWrote = props.data.leaveWrote;
-    formDataMilitary.leaveStartDate = props.data.leaveStartDate;
-    formDataMilitary.leaveEndDate = props.data.leaveEndDate;
-    formDataMilitary.leaveTotal = props.data.leaveTotal;
-    formDataMilitary.absentDaySummon = props.data.absentDaySummon;
-    formDataMilitary.absentDayLocation = props.data.absentDayLocation;
-    formDataMilitary.absentDayRegistorDate = props.data.absentDayRegistorDate;
-    formDataMilitary.absentDayGetIn = props.data.absentDayGetIn;
-    formDataMilitary.absentDayAt = props.data.absentDayAt;
-    formDataMilitary.leaveRange = props.data.leaveRange;
-    formDataMilitary.leaveRangeEnd = props.data.leaveRangeEnd;
-    const leaveTotal = await calculateDurationYmd(
-      props.data.leaveStartDate,
-      props.data.leaveEndDate
-    );
-    leaveText.value = leaveTotal;
-    formDataMilitary.leaveDetail = props.data.leaveDetail;
-    leaveDocumentList.value = props.data.leaveDocument;
-    statusCheck.value = props.data.status;
-    formDataMilitary.leaveDocument = [];
+watch(
+  () => props.data,
+  async () => {
+    if (props.data) {
+      // totalCheck.value = null;
+      formDataMilitary.leaveWrote = props.data.leaveWrote;
+      formDataMilitary.leaveStartDate = props.data.leaveStartDate;
+      formDataMilitary.leaveEndDate = props.data.leaveEndDate;
+      formDataMilitary.leaveTotal = props.data.leaveTotal;
+      formDataMilitary.absentDaySummon = props.data.absentDaySummon;
+      formDataMilitary.absentDayLocation = props.data.absentDayLocation;
+      formDataMilitary.absentDayRegistorDate = props.data.absentDayRegistorDate;
+      formDataMilitary.absentDayGetIn = props.data.absentDayGetIn;
+      formDataMilitary.absentDayAt = props.data.absentDayAt;
+      formDataMilitary.leaveRange = props.data.leaveRange;
+      formDataMilitary.leaveRangeEnd = props.data.leaveRangeEnd;
+      const leaveTotal = await calculateDurationYmd(
+        props.data.leaveStartDate,
+        props.data.leaveEndDate
+      );
+      leaveText.value = leaveTotal;
+      formDataMilitary.leaveDetail = props.data.leaveDetail;
+      leaveDocumentList.value = props.data.leaveDocument;
+      statusCheck.value = props.data.status;
+      formDataMilitary.leaveDocument = [];
+    }
   }
-});
+);
 
 /**Hook */
 onMounted(async () => {
@@ -296,7 +299,6 @@ onMounted(async () => {
           <div class="row q-col-gutter-sm">
             <div class="col-12 col-md-3 col-sm-6 inputgreen">
               <datepicker
-                menu-class-name="modalfix"
                 v-model="formDataMilitary.leaveStartDate"
                 :locale="'th'"
                 autoApply
@@ -374,7 +376,6 @@ onMounted(async () => {
           <div class="row q-col-gutter-sm"> -->
             <div class="col-12 col-md-3 col-sm-6 inputgreen">
               <datepicker
-                menu-class-name="modalfix"
                 v-model="formDataMilitary.leaveEndDate"
                 :locale="'th'"
                 autoApply
@@ -509,7 +510,6 @@ onMounted(async () => {
           <div class="q-col-gutter-sm row">
             <datepicker
               class="col-12 col-md-4 col-sm-6 inputgreen"
-              menu-class-name="modalfix"
               v-model="formDataMilitary.absentDayRegistorDate"
               :locale="'th'"
               autoApply
diff --git a/src/modules/05_leave/components/FormLeave/09_StudyForm.vue b/src/modules/05_leave/components/FormLeave/09_StudyForm.vue
index f67c402..df99247 100644
--- a/src/modules/05_leave/components/FormLeave/09_StudyForm.vue
+++ b/src/modules/05_leave/components/FormLeave/09_StudyForm.vue
@@ -230,36 +230,39 @@ async function fetchCheck() {
 // }
 
 /** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาที่ฟอร์มไหม เมื่อมีการส่งจะ map ข้อมูลเข้า v-model ของฟอร์ม */
-watch(props.data, async () => {
-  if (props.data) {
-    // totalCheck.value = null;
-    formDataStudy.leaveWrote = props.data.leaveWrote;
-    formDataStudy.leaveStartDate = props.data.leaveStartDate;
-    formDataStudy.leaveEndDate = props.data.leaveEndDate;
-    formDataStudy.leaveTotal = props.data.leaveTotal;
-    formDataStudy.leavebirthDate = props.data.leavebirthDate;
-    formDataStudy.leavegovernmentDate = props.data.leavegovernmentDate;
-    formDataStudy.leaveSalary = props.data.leaveSalary;
-    formDataStudy.leaveSalaryText = props.data.leaveSalaryText;
+watch(
+  () => props.data,
+  async () => {
+    if (props.data) {
+      // totalCheck.value = null;
+      formDataStudy.leaveWrote = props.data.leaveWrote;
+      formDataStudy.leaveStartDate = props.data.leaveStartDate;
+      formDataStudy.leaveEndDate = props.data.leaveEndDate;
+      formDataStudy.leaveTotal = props.data.leaveTotal;
+      formDataStudy.leavebirthDate = props.data.leavebirthDate;
+      formDataStudy.leavegovernmentDate = props.data.leavegovernmentDate;
+      formDataStudy.leaveSalary = props.data.leaveSalary;
+      formDataStudy.leaveSalaryText = props.data.leaveSalaryText;
 
-    formDataStudy.studyDayScholarship = props.data.studyDayScholarship;
-    formDataStudy.studyDayCountry = props.data.studyDayCountry;
-    formDataStudy.studyDayUniversityName = props.data.studyDayUniversityName;
-    formDataStudy.studyDayDegreeLevel = props.data.studyDayDegreeLevel;
-    formDataStudy.studyDaySubject = props.data.studyDaySubject;
-    formDataStudy.leaveDetail = props.data.leaveDetail;
-    formDataStudy.leaveRange = props.data.leaveRange;
-    formDataStudy.leaveRangeEnd = props.data.leaveRangeEnd;
-    formDataStudy.leaveDocument = [];
-    leaveDocumentList.value = props.data.leaveDocument;
-    const leaveTotal = await calculateDurationYmd(
-      props.data.leaveStartDate,
-      props.data.leaveEndDate
-    );
-    leaveText.value = leaveTotal;
-    statusCheck.value = props.data.status;
+      formDataStudy.studyDayScholarship = props.data.studyDayScholarship;
+      formDataStudy.studyDayCountry = props.data.studyDayCountry;
+      formDataStudy.studyDayUniversityName = props.data.studyDayUniversityName;
+      formDataStudy.studyDayDegreeLevel = props.data.studyDayDegreeLevel;
+      formDataStudy.studyDaySubject = props.data.studyDaySubject;
+      formDataStudy.leaveDetail = props.data.leaveDetail;
+      formDataStudy.leaveRange = props.data.leaveRange;
+      formDataStudy.leaveRangeEnd = props.data.leaveRangeEnd;
+      formDataStudy.leaveDocument = [];
+      leaveDocumentList.value = props.data.leaveDocument;
+      const leaveTotal = await calculateDurationYmd(
+        props.data.leaveStartDate,
+        props.data.leaveEndDate
+      );
+      leaveText.value = leaveTotal;
+      statusCheck.value = props.data.status;
+    }
   }
-});
+);
 
 /**Hook */
 onMounted(async () => {
@@ -323,7 +326,6 @@ onMounted(async () => {
           <div class="row q-col-gutter-sm">
             <div class="col-12 col-md-3 col-sm-6 inputgreen">
               <datepicker
-                menu-class-name="modalfix"
                 v-model="formDataStudy.leaveStartDate"
                 :locale="'th'"
                 autoApply
@@ -401,7 +403,6 @@ onMounted(async () => {
           <div class="row q-col-gutter-sm"> -->
             <div class="col-12 col-md-3 col-sm-6 inputgreen">
               <datepicker
-                menu-class-name="modalfix"
                 v-model="formDataStudy.leaveEndDate"
                 :locale="'th'"
                 autoApply
@@ -504,7 +505,6 @@ onMounted(async () => {
           <div class="q-col-gutter-sm row">
             <div class="col-12 col-md-3 col-sm-6">
               <datepicker
-                menu-class-name="modalfix"
                 autoApply
                 borderless
                 week-start="0"
@@ -552,7 +552,6 @@ onMounted(async () => {
 
             <div class="col-12 col-md-3 col-sm-6">
               <datepicker
-                menu-class-name="modalfix"
                 autoApply
                 borderless
                 readonly
diff --git a/src/modules/05_leave/components/FormLeave/10_TrainForm.vue b/src/modules/05_leave/components/FormLeave/10_TrainForm.vue
index 51037a9..42553e9 100644
--- a/src/modules/05_leave/components/FormLeave/10_TrainForm.vue
+++ b/src/modules/05_leave/components/FormLeave/10_TrainForm.vue
@@ -214,34 +214,38 @@ function updateLeaveTotal() {
   formDataTrain.leaveTotal = newLeaveTotal;
 }
 
-watch(props.data, async () => {
-  if (props.data) {
-    // totalCheck.value = null;
-    formDataTrain.leaveWrote = props.data.leaveWrote;
-    formDataTrain.leaveStartDate = props.data.leaveStartDate;
-    formDataTrain.leaveEndDate = props.data.leaveEndDate;
-    formDataTrain.leaveTotal = props.data.leaveTotal;
-    formDataTrain.leavebirthDate = props.data.leavebirthDate;
-    formDataTrain.leavegovernmentDate = props.data.leavegovernmentDate;
-    formDataTrain.leaveSalary = props.data.leaveSalary;
-    formDataTrain.leaveSalaryText = props.data.leaveSalaryText;
-    formDataTrain.studyDayScholarship = props.data.studyDayScholarship;
-    formDataTrain.studyDayCountry = props.data.studyDayCountry;
-    formDataTrain.studyDayTrainingSubject = props.data.studyDayTrainingSubject;
-    formDataTrain.studyDayTrainingName = props.data.studyDayTrainingName;
-    formDataTrain.leaveDetail = props.data.leaveDetail;
-    formDataTrain.leaveRange = props.data.leaveRange;
-    formDataTrain.leaveRangeEnd = props.data.leaveRangeEnd;
-    formDataTrain.leaveDocument = [];
-    const leaveTotal = await calculateDurationYmd(
-      props.data.leaveStartDate,
-      props.data.leaveEndDate
-    );
-    leaveText.value = leaveTotal;
-    leaveDocumentList.value = props.data.leaveDocument;
-    statusCheck.value = props.data.status;
+watch(
+  () => props.data,
+  async () => {
+    if (props.data) {
+      // totalCheck.value = null;
+      formDataTrain.leaveWrote = props.data.leaveWrote;
+      formDataTrain.leaveStartDate = props.data.leaveStartDate;
+      formDataTrain.leaveEndDate = props.data.leaveEndDate;
+      formDataTrain.leaveTotal = props.data.leaveTotal;
+      formDataTrain.leavebirthDate = props.data.leavebirthDate;
+      formDataTrain.leavegovernmentDate = props.data.leavegovernmentDate;
+      formDataTrain.leaveSalary = props.data.leaveSalary;
+      formDataTrain.leaveSalaryText = props.data.leaveSalaryText;
+      formDataTrain.studyDayScholarship = props.data.studyDayScholarship;
+      formDataTrain.studyDayCountry = props.data.studyDayCountry;
+      formDataTrain.studyDayTrainingSubject =
+        props.data.studyDayTrainingSubject;
+      formDataTrain.studyDayTrainingName = props.data.studyDayTrainingName;
+      formDataTrain.leaveDetail = props.data.leaveDetail;
+      formDataTrain.leaveRange = props.data.leaveRange;
+      formDataTrain.leaveRangeEnd = props.data.leaveRangeEnd;
+      formDataTrain.leaveDocument = [];
+      const leaveTotal = await calculateDurationYmd(
+        props.data.leaveStartDate,
+        props.data.leaveEndDate
+      );
+      leaveText.value = leaveTotal;
+      leaveDocumentList.value = props.data.leaveDocument;
+      statusCheck.value = props.data.status;
+    }
   }
-});
+);
 
 /**Hook */
 onMounted(async () => {
@@ -303,7 +307,6 @@ onMounted(async () => {
           <div class="row q-col-gutter-sm">
             <div class="col-12 col-md-3 col-sm-6 inputgreen">
               <datepicker
-                menu-class-name="modalfix"
                 v-model="formDataTrain.leaveStartDate"
                 :locale="'th'"
                 autoApply
@@ -380,7 +383,6 @@ onMounted(async () => {
           <div class="row q-col-gutter-sm"> -->
             <div class="col-12 col-md-3 col-sm-6 inputgreen">
               <datepicker
-                menu-class-name="modalfix"
                 v-model="formDataTrain.leaveEndDate"
                 :locale="'th'"
                 autoApply
@@ -484,7 +486,6 @@ onMounted(async () => {
             <div class="col-12 col-sm-3">
               <datepicker
                 v-model="formDataTrain.leavegovernmentDate"
-                menu-class-name="modalfix"
                 autoApply
                 borderless
                 week-start="0"
@@ -533,7 +534,6 @@ onMounted(async () => {
             <div class="col-12 col-sm-3">
               <datepicker
                 v-model="formDataTrain.leavebirthDate"
-                menu-class-name="modalfix"
                 autoApply
                 borderless
                 readonly
diff --git a/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue b/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue
index b789d01..1455a29 100644
--- a/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue
+++ b/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue
@@ -219,30 +219,35 @@ const leaveDocumentList = ref<any>();
 const leaveDraftDocument = ref<string>();
 const statusCheck = ref<string>("");
 
-watch(props, async () => {
-  if (props.data) {
-    // totalCheck.value = null;
-    formDataWorkInternational.leaveWrote = props.data.leaveWrote;
-    formDataWorkInternational.leaveStartDate = new Date(
-      props.data.leaveStartDate
-    );
-    formDataWorkInternational.leaveEndDate = new Date(props.data.leaveEndDate);
-    formDataWorkInternational.leaveDetail = props.data.leaveDetail;
-    leaveDraftDocument.value = props.data.leaveDraftDocument;
-    formDataWorkInternational.leaveRange = props.data.leaveRange;
-    formDataWorkInternational.leaveRangeEnd = props.data.leaveRangeEnd;
-    formDataWorkInternational.leaveTotal = props.data.leaveTotal;
-    leaveDocumentList.value = props.data.leaveDocument;
-    statusCheck.value = props.data.status;
-    formDataWorkInternational.leaveDraftDocument = null;
-    formDataWorkInternational.leaveDocument = [];
-    const leaveTotal = await calculateDurationYmd(
-      props.data.leaveStartDate,
-      props.data.leaveEndDate
-    );
-    leaveText.value = leaveTotal;
+watch(
+  () => props,
+  async () => {
+    if (props.data) {
+      // totalCheck.value = null;
+      formDataWorkInternational.leaveWrote = props.data.leaveWrote;
+      formDataWorkInternational.leaveStartDate = new Date(
+        props.data.leaveStartDate
+      );
+      formDataWorkInternational.leaveEndDate = new Date(
+        props.data.leaveEndDate
+      );
+      formDataWorkInternational.leaveDetail = props.data.leaveDetail;
+      leaveDraftDocument.value = props.data.leaveDraftDocument;
+      formDataWorkInternational.leaveRange = props.data.leaveRange;
+      formDataWorkInternational.leaveRangeEnd = props.data.leaveRangeEnd;
+      formDataWorkInternational.leaveTotal = props.data.leaveTotal;
+      leaveDocumentList.value = props.data.leaveDocument;
+      statusCheck.value = props.data.status;
+      formDataWorkInternational.leaveDraftDocument = null;
+      formDataWorkInternational.leaveDocument = [];
+      const leaveTotal = await calculateDurationYmd(
+        props.data.leaveStartDate,
+        props.data.leaveEndDate
+      );
+      leaveText.value = leaveTotal;
+    }
   }
-});
+);
 
 watch(
   () => formDataWorkInternational.leaveEndDate,
@@ -311,7 +316,6 @@ onMounted(async () => {
           <div class="row q-col-gutter-sm">
             <div class="col-12 col-md-3 col-sm-6 inputgreen">
               <datepicker
-                menu-class-name="modalfix"
                 v-model="formDataWorkInternational.leaveStartDate"
                 :locale="'th'"
                 autoApply
@@ -388,7 +392,6 @@ onMounted(async () => {
           <div class="row q-col-gutter-sm"> -->
             <div class="col-12 col-md-3 col-sm-6 inputgreen">
               <datepicker
-                menu-class-name="modalfix"
                 v-model="formDataWorkInternational.leaveEndDate"
                 :locale="'th'"
                 autoApply
diff --git a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue
index d07bb2e..fc3785c 100644
--- a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue
+++ b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue
@@ -285,50 +285,53 @@ const dateEndInputStyle = computed(() => {
 /** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาที่ฟอร์มไหม เมื่อมีการส่งจะ map ข้อมูลเข้า v-model ของฟอร์ม */
 const leaveDocumentList = ref<any>();
 const statusCheck = ref<any>("");
-watch(props.data, async () => {
-  if (props.data) {
-    // totalCheck.value = null;
-    formDataFollowSpouse.leaveWrote = props.data.leaveWrote;
-    formDataFollowSpouse.leaveStartDate = new Date(props.data.leaveStartDate);
-    formDataFollowSpouse.leaveEndDate = new Date(props.data.leaveEndDate);
-    formDataFollowSpouse.leaveDetail = props.data.leaveDetail;
-    formDataFollowSpouse.leaveTotal = props.data.leaveTotal;
-    formDataFollowSpouse.leaveSalaryText = props.data.leaveSalaryText;
-    formDataFollowSpouse.leaveSalary = props.data.leaveSalary;
-    formDataFollowSpouse.coupleDayName = props.data.coupleDayName;
-    formDataFollowSpouse.coupleDayPosition = props.data.coupleDayPosition;
-    formDataFollowSpouse.coupleDayLevel = props.data.coupleDayLevel;
-    formDataFollowSpouse.leaveRange = props.data.leaveRange;
-    formDataFollowSpouse.leaveRangeEnd = props.data.leaveRangeEnd;
-    formDataFollowSpouse.coupleDaySumTotalHistory =
-      props.data.coupleDaySumTotalHistory;
-    formDataFollowSpouse.coupleDayLevelCountry =
-      props.data.coupleDayLevelCountry;
-    formDataFollowSpouse.coupleDayCountryHistory =
-      props.data.coupleDayCountryHistory;
-    formDataFollowSpouse.coupleDayTotalHistory =
-      props.data.coupleDayTotalHistory;
-    formDataFollowSpouse.coupleDayStartDateHistory =
-      props.data.coupleDayStartDateHistory;
-    formDataFollowSpouse.coupleDayEndDateHistory =
-      props.data.coupleDayEndDateHistory;
-    leaveDocumentList.value = props.data.leaveDocument;
-    checkTotalHistory();
-    const leaveTotal = await calculateDurationYmd(
-      props.data.leaveStartDate,
-      props.data.leaveEndDate
-    );
-    leaveText.value = leaveTotal;
+watch(
+  () => props.data,
+  async () => {
+    if (props.data) {
+      // totalCheck.value = null;
+      formDataFollowSpouse.leaveWrote = props.data.leaveWrote;
+      formDataFollowSpouse.leaveStartDate = new Date(props.data.leaveStartDate);
+      formDataFollowSpouse.leaveEndDate = new Date(props.data.leaveEndDate);
+      formDataFollowSpouse.leaveDetail = props.data.leaveDetail;
+      formDataFollowSpouse.leaveTotal = props.data.leaveTotal;
+      formDataFollowSpouse.leaveSalaryText = props.data.leaveSalaryText;
+      formDataFollowSpouse.leaveSalary = props.data.leaveSalary;
+      formDataFollowSpouse.coupleDayName = props.data.coupleDayName;
+      formDataFollowSpouse.coupleDayPosition = props.data.coupleDayPosition;
+      formDataFollowSpouse.coupleDayLevel = props.data.coupleDayLevel;
+      formDataFollowSpouse.leaveRange = props.data.leaveRange;
+      formDataFollowSpouse.leaveRangeEnd = props.data.leaveRangeEnd;
+      formDataFollowSpouse.coupleDaySumTotalHistory =
+        props.data.coupleDaySumTotalHistory;
+      formDataFollowSpouse.coupleDayLevelCountry =
+        props.data.coupleDayLevelCountry;
+      formDataFollowSpouse.coupleDayCountryHistory =
+        props.data.coupleDayCountryHistory;
+      formDataFollowSpouse.coupleDayTotalHistory =
+        props.data.coupleDayTotalHistory;
+      formDataFollowSpouse.coupleDayStartDateHistory =
+        props.data.coupleDayStartDateHistory;
+      formDataFollowSpouse.coupleDayEndDateHistory =
+        props.data.coupleDayEndDateHistory;
+      leaveDocumentList.value = props.data.leaveDocument;
+      checkTotalHistory();
+      const leaveTotal = await calculateDurationYmd(
+        props.data.leaveStartDate,
+        props.data.leaveEndDate
+      );
+      leaveText.value = leaveTotal;
 
-    const coupleDayTotalHistory = await calculateDurationYmd(
-      props.data.coupleDayStartDateHistory,
-      props.data.coupleDayEndDateHistory
-    );
-    formDataFollowSpouse.coupleDayTotalHistory = coupleDayTotalHistory;
-    statusCheck.value = props.data.status;
-    formDataFollowSpouse.leaveDocument = [];
+      const coupleDayTotalHistory = await calculateDurationYmd(
+        props.data.coupleDayStartDateHistory,
+        props.data.coupleDayEndDateHistory
+      );
+      formDataFollowSpouse.coupleDayTotalHistory = coupleDayTotalHistory;
+      statusCheck.value = props.data.status;
+      formDataFollowSpouse.leaveDocument = [];
+    }
   }
-});
+);
 
 /**Hook */
 onMounted(async () => {
@@ -405,7 +408,6 @@ onMounted(async () => {
           <div class="row q-col-gutter-sm">
             <div class="col-12 col-md-3 col-sm-6 inputgreen">
               <datepicker
-                menu-class-name="modalfix"
                 v-model="formDataFollowSpouse.leaveStartDate"
                 :locale="'th'"
                 autoApply
@@ -483,7 +485,6 @@ onMounted(async () => {
           <div class="row q-col-gutter-sm"> -->
             <div class="col-12 col-md-3 col-sm-6 inputgreen">
               <datepicker
-                menu-class-name="modalfix"
                 v-model="formDataFollowSpouse.leaveEndDate"
                 :locale="'th'"
                 autoApply
@@ -673,7 +674,6 @@ onMounted(async () => {
 
         <datepicker
           class="col-12 col-md-3 col-sm-12 inputgreen"
-          menu-class-name="modalfix"
           v-model="formDataFollowSpouse.coupleDayStartDateHistory"
           :locale="'th'"
           autoApply
@@ -720,7 +720,6 @@ onMounted(async () => {
         </datepicker>
         <datepicker
           class="col-12 col-md-3 col-sm-12 inputgreen"
-          menu-class-name="modalfix"
           v-model="formDataFollowSpouse.coupleDayEndDateHistory"
           :locale="'th'"
           autoApply
diff --git a/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue b/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue
index 755318f..bc17d96 100644
--- a/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue
+++ b/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue
@@ -198,27 +198,32 @@ const dateEndInputStyle = computed(() => {
 const leaveDocumentList = ref<any>();
 const leaveDraftDocument = ref<string>();
 const statusCheck = ref<string>("");
-watch(props.data, async () => {
-  if (props.data) {
-    // totalCheck.value = null;
-    formDataRehabilitation.leaveWrote = props.data.leaveWrote;
-    formDataRehabilitation.leaveStartDate = new Date(props.data.leaveStartDate);
-    formDataRehabilitation.leaveEndDate = new Date(props.data.leaveEndDate);
-    formDataRehabilitation.leaveDetail = props.data.leaveDetail;
-    leaveDraftDocument.value = props.data.leaveDraftDocument;
-    leaveDocumentList.value = props.data.leaveDocument;
-    formDataRehabilitation.leaveRange = props.data.leaveRange;
-    formDataRehabilitation.leaveRangeEnd = props.data.leaveRangeEnd;
-    formDataRehabilitation.leaveDraftDocument = null;
-    formDataRehabilitation.leaveDocument = [];
-    statusCheck.value = props.data.status;
-    const leaveTotal = await calculateDurationYmd(
-      props.data.leaveStartDate,
-      props.data.leaveEndDate
-    );
-    leaveText.value = leaveTotal;
+watch(
+  () => props.data,
+  async () => {
+    if (props.data) {
+      // totalCheck.value = null;
+      formDataRehabilitation.leaveWrote = props.data.leaveWrote;
+      formDataRehabilitation.leaveStartDate = new Date(
+        props.data.leaveStartDate
+      );
+      formDataRehabilitation.leaveEndDate = new Date(props.data.leaveEndDate);
+      formDataRehabilitation.leaveDetail = props.data.leaveDetail;
+      leaveDraftDocument.value = props.data.leaveDraftDocument;
+      leaveDocumentList.value = props.data.leaveDocument;
+      formDataRehabilitation.leaveRange = props.data.leaveRange;
+      formDataRehabilitation.leaveRangeEnd = props.data.leaveRangeEnd;
+      formDataRehabilitation.leaveDraftDocument = null;
+      formDataRehabilitation.leaveDocument = [];
+      statusCheck.value = props.data.status;
+      const leaveTotal = await calculateDurationYmd(
+        props.data.leaveStartDate,
+        props.data.leaveEndDate
+      );
+      leaveText.value = leaveTotal;
+    }
   }
-});
+);
 
 /**Hook */
 onMounted(async () => {
@@ -274,7 +279,6 @@ onMounted(async () => {
           <div class="row q-col-gutter-sm">
             <div class="col-12 col-md-3 col-sm-6 inputgreen">
               <datepicker
-                menu-class-name="modalfix"
                 v-model="formDataRehabilitation.leaveStartDate"
                 :locale="'th'"
                 autoApply
@@ -351,7 +355,6 @@ onMounted(async () => {
           <div class="row q-col-gutter-sm"> -->
             <div class="col-12 col-md-3 col-sm-6 inputgreen">
               <datepicker
-                menu-class-name="modalfix"
                 v-model="formDataRehabilitation.leaveEndDate"
                 :locale="'th'"
                 autoApply
diff --git a/src/modules/05_leave/components/FormLeave/Form.vue b/src/modules/05_leave/components/FormLeave/Form.vue
index f92d057..e0fd86a 100644
--- a/src/modules/05_leave/components/FormLeave/Form.vue
+++ b/src/modules/05_leave/components/FormLeave/Form.vue
@@ -101,7 +101,10 @@ async function getCommander() {
       page: pagination.value.page,
       pageSize: pagination.value.rowsPerPage,
       keycloakId: storeData.formData.keycloakId,
-      type:storeData.officerType.toLocaleUpperCase() == 'OFFICER' ? 'officer':'employee'
+      type:
+        storeData.officerType.toLocaleUpperCase() == "OFFICER"
+          ? "officer"
+          : "employee",
     })
     .then((res) => {
       rows.value = res.data.result.data;
@@ -170,7 +173,6 @@ onMounted(() => {
     <div class="col-12 row q-pa-sm q-col-gutter-sm">
       <datepicker
         class="col-12 col-sm-6"
-        menu-class-name="modalfix"
         v-model="dataStore.dateSendLeave"
         :locale="'th'"
         autoApply
diff --git a/src/modules/05_leave/components/Table.vue b/src/modules/05_leave/components/Table.vue
index 0892325..bddea14 100644
--- a/src/modules/05_leave/components/Table.vue
+++ b/src/modules/05_leave/components/Table.vue
@@ -101,7 +101,6 @@ watch([() => currentPage.value, () => pagination.value.rowsPerPage], () => {
       <div class="items-center col-12 row q-col-gutter-sm">
         <datepicker
           v-if="leaveStore.tabValue === 'list'"
-          menu-class-name="modalfix"
           v-model="year"
           class="col-xs-12 col-sm-auto"
           :locale="'th'"
diff --git a/src/modules/05_leave/store.ts b/src/modules/05_leave/store.ts
index 353754b..5abf71f 100644
--- a/src/modules/05_leave/store.ts
+++ b/src/modules/05_leave/store.ts
@@ -1,6 +1,5 @@
 import { defineStore } from "pinia";
 import { ref } from "vue";
-import { useQuasar } from "quasar";
 
 import http from "@/plugins/http";
 import config from "@/app.config";
@@ -19,7 +18,6 @@ import type { DataOption } from "../14_IDP/interface/Main";
 
 const mixin = useCounterMixin();
 const { date2Thai, messageError, showLoader, hideLoader } = mixin;
-const $q = useQuasar();
 const type = ref<string>("00000000-0000-0000-0000-000000000000");
 const status = ref<string>("ALL");
 export const useLeaveStore = defineStore("Leave", () => {
@@ -344,7 +342,7 @@ export const useLeaveStore = defineStore("Leave", () => {
           Number(data.leaveLimit) - Number(data.restDayTotalOld);
       })
       .catch((e: any) => {
-        messageError($q, e);
+        console.log(e);
       })
       .finally(() => {
         hideLoader();
@@ -368,7 +366,7 @@ export const useLeaveStore = defineStore("Leave", () => {
           Number(data.leaveLimit) - Number(data.restDayTotalOld);
       })
       .catch((e: any) => {
-        messageError($q, e);
+        console.log(e);
       });
 
     dateSendLeave.value = data.dateSendLeave;
diff --git a/src/plugins/genreport.ts b/src/plugins/genreport.ts
index 3c8a638..8b2b917 100644
--- a/src/plugins/genreport.ts
+++ b/src/plugins/genreport.ts
@@ -1,13 +1,10 @@
 import axios from "axios";
 import config from "@/app.config";
 
-import { useQuasar } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 
-const $q = useQuasar();
-
 const mixin = useCounterMixin();
-const { showLoader, hideLoader, messageError } = mixin;
+const { showLoader, hideLoader } = mixin;
 
 async function genReport(data: any, fileName: string, type: string = "docx") {
   showLoader();
@@ -49,7 +46,7 @@ async function genReport(data: any, fileName: string, type: string = "docx") {
       }
     })
     .catch((err) => {
-      messageError($q, err);
+      console.log(err);
     })
     .finally(() => {
       hideLoader();