diff --git a/src/modules/05_leave/components/DialogDetail.vue b/src/modules/05_leave/components/DialogDetail.vue
index 76b9922..8eb7ea8 100644
--- a/src/modules/05_leave/components/DialogDetail.vue
+++ b/src/modules/05_leave/components/DialogDetail.vue
@@ -8,12 +8,12 @@ import config from "@/app.config"
 import type { FremDetail, FormDelete, FormDeleteRef, FromCancelDetail } from "@/modules/05_leave/interface/response/leave"
 
 /** import componest*/
-import FormLeave from "@/modules/05_leave/components/formDetail/formLeave.vue"
-import FormChildbirth from "@/modules/05_leave/components/formDetail/formChildbirth.vue"
-import FormHoliday from "@/modules/05_leave/components/formDetail/formHoliday.vue"
-import FormUpasom from "@/modules/05_leave/components/formDetail/formUpasom.vue"
-import FormHajj from "@/modules/05_leave/components/formDetail/formHajj.vue"
-import FormCheckSelect from "@/modules/05_leave/components/formDetail/formCheckSelect.vue"
+import FormLeave from "@/modules/05_leave/components/formDetail/01_SickForm.vue"
+import FormChildbirth from "@/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue"
+import FormHoliday from "@/modules/05_leave/components/formDetail/05_VacationForm.vue"
+import FormUpasom from "@/modules/05_leave/components/formDetail/06_OrdinationForm.vue"
+import FormHajj from "@/modules/05_leave/components/formDetail/07_HajjForm.vue"
+import FormCheckSelect from "@/modules/05_leave/components/formDetail/08_MilitaryForm.vue"
 import FormStudy from "@/modules/05_leave/components/formDetail/formStudy.vue"
 import FormLeaveToTraining from "@/modules/05_leave/components/formDetail/formLeaveToTraining.vue"
 import FormLeaveToWorkInternational from "@/modules/05_leave/components/formDetail/formLeaveToWorkInternational.vue"
@@ -125,6 +125,7 @@ const formData = reactive<FremDetail>({
 	coupleDaySumTotalHistory: "", //ประวัติ ในกรณีลาติดต่อกับครั้งก่อน รวมทั้งนี้ด้วย เป็นเวลา กี่ปี กี่เดือน กี่วัน (ลาติดตามคู่สมรส)
 	approveStep: "",
 	dear: "",
+	leaveRange: ""
 })
 /** Form รายละเอียดข้อมูล*/
 const formDataCancle = reactive<FromCancelDetail>({
@@ -184,7 +185,8 @@ async function fetchDataDetail(id: string) {
 			formData.leaveNumber = data.leaveNumber ?? "-"
 			formData.leaveDetail = data.leaveDetail ?? "-"
 			formData.leaveDocument = data.leaveDocument
-			formData.leaveDraftDocument = data.leaveDraftDocument
+			formData.leaveDocument = data.leaveDocument
+			formData.leaveRange = data.leaveRange
 			formData.leaveLastStart = data.leaveLastStart && date2Thai(data.leaveLastStart)
 			formData.leaveLastEnd = data.leaveLastStart && date2Thai(data.leaveLastEnd)
 			// formData.leaveTotal = calculateDurationYmd(data.leaveStartDate, data.leaveEndDate)
diff --git a/src/modules/05_leave/components/FormLeave/01_SickForm.vue b/src/modules/05_leave/components/FormLeave/01_SickForm.vue
index 14b0f9f..b0ccf80 100644
--- a/src/modules/05_leave/components/FormLeave/01_SickForm.vue
+++ b/src/modules/05_leave/components/FormLeave/01_SickForm.vue
@@ -196,6 +196,7 @@ onMounted(() => {
     formDataSick.leaveTotal = props.data.leaveTotal;
     formDataSick.leaveNumber = props.data.leaveNumber;
     formDataSick.leaveDetail = props.data.leaveDetail;
+    formDataSick.leaveRange = props.data.leaveRange;
     leaveDocumentList.value = props.data.leaveDocument;
     formDataSick.leaveAddress = props.data.leaveAddress;
     statusCheck.value = props.data.status;
diff --git a/src/modules/05_leave/components/FormLeave/03_Birth.vue b/src/modules/05_leave/components/FormLeave/03_Birth.vue
index 58ac4e6..718939a 100644
--- a/src/modules/05_leave/components/FormLeave/03_Birth.vue
+++ b/src/modules/05_leave/components/FormLeave/03_Birth.vue
@@ -413,7 +413,6 @@ onMounted(() => {
                       {{ "เอกสารแนบที่ " + (index + 1) }}
                     </div>
                     <q-btn
-                      class="col-6"
                       :href="document"
                       target="_blank"
                       outline
diff --git a/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue b/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue
index 232ece3..c347cc6 100644
--- a/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue
+++ b/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue
@@ -114,9 +114,12 @@ function onValidate() {
     formData.append("type", formDataHelpWife.type);
     formData.append(
       "leaveStartDate",
-      dateToISO(formDataHelpWife.leaveStartDate)
+      dateToISO(new Date(formDataHelpWife.leaveStartDate))
+    );
+    formData.append(
+      "leaveEndDate",
+      dateToISO(new Date(formDataHelpWife.leaveEndDate))
     );
-    formData.append("leaveEndDate", dateToISO(formDataHelpWife.leaveEndDate));
     formData.append("leaveWrote", formDataHelpWife.leaveWrote);
     formData.append("leaveAddress", formDataHelpWife.leaveAddress);
     formData.append("leaveNumber", formDataHelpWife.leaveNumber);
@@ -483,7 +486,6 @@ onMounted(() => {
                         {{ "เอกสารแนบที่ " + (index + 1) }}
                       </div>
                       <q-btn
-                        class="col-6"
                         :href="document"
                         target="_blank"
                         outline
diff --git a/src/modules/05_leave/components/FormLeave/05_VacationForm.vue b/src/modules/05_leave/components/FormLeave/05_VacationForm.vue
index 81b8582..bca0c20 100644
--- a/src/modules/05_leave/components/FormLeave/05_VacationForm.vue
+++ b/src/modules/05_leave/components/FormLeave/05_VacationForm.vue
@@ -111,9 +111,9 @@ function onValidate() {
     formData.append("leaveRange", formDataVacation.leaveRange);
     formData.append(
       "leaveStartDate",
-      dateToISO(formDataVacation.leaveStartDate)
+      dateToISO(new Date(formDataVacation.leaveStartDate))
     );
-    formData.append("leaveEndDate", dateToISO(formDataVacation.leaveEndDate));
+    formData.append("leaveEndDate", dateToISO(new Date(formDataVacation.leaveEndDate)));
     formData.append("leaveWrote", formDataVacation.leaveWrote);
     formData.append("leaveAddress", formDataVacation.leaveAddress);
     formData.append("leaveNumber", formDataVacation.leaveNumber);
@@ -194,6 +194,7 @@ onMounted(() => {
     formDataVacation.leaveDetail = props.data.leaveDetail;
     leaveDocumentList.value = props.data.leaveDocument;
     statusCheck.value = props.data.status;
+    formDataVacation.leaveRange = props.data.leaveRange;
     // formDataVacation.leaveDocument = props.data.leaveDocument;
   }
 });
@@ -481,7 +482,6 @@ onMounted(() => {
                         {{ "เอกสารแนบที่ " + (index + 1) }}
                       </div>
                       <q-btn
-                        class="col-6"
                         :href="document"
                         target="_blank"
                         outline
diff --git a/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue b/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue
index 3124ac4..476f568 100644
--- a/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue
+++ b/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue
@@ -71,8 +71,9 @@ const formDataOrdination = reactive<any>({
   ordainDayLocationAddress: "",
   ordainDayBuddhistLentName: "",
   ordainDayBuddhistLentAddress: "",
-  ordainDayStatus: "true",
-  leaveDocument: null,
+  ordainDayStatus: true,
+  leaveDocument: [],
+  leaveDetail: ""
 });
 
 /** maping ref เข้าตัวแปรเพื่อเตรียมตรวจสอบ */
@@ -113,21 +114,28 @@ function onValidate() {
       }
     }
   }
+
   if (hasError.every((result) => result === true)) {
     const formData = new FormData();
-    formDataOrdination.leaveDocument.forEach((file: File) => {
-      formData.append("leaveDocument", file);
-    });
+
+    if (formDataOrdination.leaveDocument) {
+      formDataOrdination.leaveDocument.forEach((file: File) => {
+        formData.append("leaveDocument", file);
+      });
+    }
     // formData.append("leaveDocument", formDataOrdination.leaveDocument);
     formData.append("type", formDataOrdination.type);
     formData.append(
       "leaveStartDate",
-      dateToISO(formDataOrdination.leaveStartDate)
+      dateToISO(new Date(formDataOrdination.leaveStartDate))
+    );
+    formData.append(
+      "leaveEndDate",
+      dateToISO(new Date(formDataOrdination.leaveEndDate))
     );
-    formData.append("leaveEndDate", dateToISO(formDataOrdination.leaveEndDate));
     formData.append(
       "ordainDayOrdination",
-      dateToISO(formDataOrdination.ordainDayOrdination)
+      dateToISO(new Date(formDataOrdination.ordainDayOrdination))
     );
     formData.append(
       "ordainDayLocationName",
@@ -611,7 +619,7 @@ onMounted(() => {
           label="รายละเอียด"
           :readonly="!edit || statusCheck === 'NEW'"
         />
-        <div class="full-width col-12" v-if="statusCheck != 'NEW'">
+        <div class="full-width" v-if="statusCheck != 'NEW'">
           <div class="q-col-gutter-sm row">
             <!-- multiple -->
             <q-file
@@ -624,6 +632,7 @@ onMounted(() => {
               outlined
               bg-color="white"
               use-chips
+              class="col-12 q-pl-sm col-12"
             >
               <template v-slot:prepend>
                 <q-icon name="attach_file" color="primary" />
@@ -652,10 +661,9 @@ onMounted(() => {
                   <q-item-section>
                     <q-item-label class="row items-baseline">
                       <div class="col">
-                        {{ "เอกสารแนบที่ " + (index + 1) }}
+                        {{ "เอกสารแนบฉบับที่ " + (index + 1) }}
                       </div>
                       <q-btn
-                        class="col-6"
                         :href="document"
                         target="_blank"
                         outline
@@ -677,30 +685,6 @@ onMounted(() => {
             </q-card>
           </div>
         </div>
-
-        <div class="col-12 col-sm-6 row" v-if="!edit">
-          <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
-            <div class="q-pl-sm text-weight-bold text-dark">
-              เอกสารเพิ่มเติม
-            </div>
-          </div>
-          <q-card bordered flat class="full-width">
-            <q-list separator>
-              <q-item
-                v-for="(file, index) in leaveDocumentList"
-                :key="index"
-                class="q-my-xs"
-              >
-                <q-item-section>
-                  <q-item-label class="full-width ellipsis">
-                    {{ file.name }}
-                  </q-item-label>
-                  <q-item-label caption> </q-item-label>
-                </q-item-section>
-              </q-item>
-            </q-list>
-          </q-card>
-        </div>
       </div>
     </q-card>
 
diff --git a/src/modules/05_leave/components/FormLeave/07_HajjForm.vue b/src/modules/05_leave/components/FormLeave/07_HajjForm.vue
index efb85a3..957c7d6 100644
--- a/src/modules/05_leave/components/FormLeave/07_HajjForm.vue
+++ b/src/modules/05_leave/components/FormLeave/07_HajjForm.vue
@@ -55,9 +55,10 @@ const formDataHaji = reactive<any>({
   leavegovernmentDate: null,
   leaveStartDate: null,
   leaveEndDate: null,
-  totalLeave: null,
+  totalLeave: 0,
   hajjDayStatus: "true",
-  leaveDocument: null,
+  leaveDocument: [],
+  leaveDetail: "",
 });
 
 /** maping ref เข้าตัวแปรเพื่อเตรียมตรวจสอบ */
@@ -97,8 +98,14 @@ function onValidate() {
     });
     // formData.append("leaveDocument", formDataHaji.leaveDocument);
     formData.append("type", formDataHaji.type);
-    formData.append("leaveStartDate", dateToISO(formDataHaji.leaveStartDate));
-    formData.append("leaveEndDate", dateToISO(formDataHaji.leaveEndDate));
+    formData.append(
+      "leaveStartDate",
+      dateToISO(new Date(formDataHaji.leaveStartDate))
+    );
+    formData.append(
+      "leaveEndDate",
+      dateToISO(new Date(formDataHaji.leaveEndDate))
+    );
     formData.append("hajjDayStatus", formDataHaji.hajjDayStatus);
     formData.append("leaveWrote", formDataHaji.leaveWrote);
     formData.append("leaveDetail", formDataHaji.leaveDetail);
@@ -397,6 +404,7 @@ onMounted(() => {
               dense
               outlined
               hide-bottom-space
+              class="col-12 q-pl-sm col-12"
             >
               <template v-slot:prepend>
                 <q-icon name="attach_file" color="primary" />
@@ -428,7 +436,6 @@ onMounted(() => {
                         {{ "เอกสารแนบที่ " + (index + 1) }}
                       </div>
                       <q-btn
-                        class="col-6"
                         :href="document"
                         target="_blank"
                         outline
@@ -451,30 +458,6 @@ onMounted(() => {
             </q-card>
           </div>
         </div>
-
-        <div class="col-12 col-sm-6 row" v-if="!edit">
-          <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
-            <div class="q-pl-sm text-weight-bold text-dark">
-              เอกสารเพิ่มเติม
-            </div>
-          </div>
-          <q-card bordered flat class="full-width">
-            <q-list separator>
-              <q-item
-                v-for="(file, index) in leaveDocumentList"
-                :key="index"
-                class="q-my-xs"
-              >
-                <q-item-section>
-                  <q-item-label class="full-width ellipsis">
-                    {{ file.name }}
-                  </q-item-label>
-                  <q-item-label caption> </q-item-label>
-                </q-item-section>
-              </q-item>
-            </q-list>
-          </q-card>
-        </div>
       </div>
     </q-card>
     <q-separator class="q-mt-sm" />
diff --git a/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue b/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue
index 3be5c3a..d3790e7 100644
--- a/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue
+++ b/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue
@@ -58,7 +58,7 @@ const formDataMilitary = reactive<any>({
   leaveStartDate: null,
   leaveEndDate: null,
   leaveTotal: 0,
-  leaveDocument: null,
+  leaveDocument: [],
   leaveWrote: "",
   absentDaySummon: "",
   absentDayLocation: "",
@@ -111,14 +111,14 @@ function onValidate() {
     formData.append("type", formDataMilitary.type);
     formData.append(
       "leaveStartDate",
-      dateToISO(formDataMilitary.leaveStartDate)
+      dateToISO(new Date(formDataMilitary.leaveStartDate))
     );
-    formData.append("leaveEndDate", dateToISO(formDataMilitary.leaveEndDate));
+    formData.append("leaveEndDate", dateToISO(new Date(formDataMilitary.leaveEndDate)));
     formData.append("absentDaySummon", formDataMilitary.absentDaySummon);
     formData.append("absentDayLocation", formDataMilitary.absentDayLocation);
     formData.append(
       "absentDayRegistorDate",
-      dateToISO(formDataMilitary.absentDayRegistorDate)
+      dateToISO(new Date(formDataMilitary.absentDayRegistorDate))
     );
     formData.append("absentDayGetIn", formDataMilitary.absentDayGetIn);
     formData.append("absentDayAt", formDataMilitary.absentDayAt);
@@ -485,7 +485,6 @@ onMounted(() => {
                           {{ "เอกสารแนบที่ " + (index + 1) }}
                         </div>
                         <q-btn
-                          class="col-6"
                           :href="document"
                           target="_blank"
                           outline
diff --git a/src/modules/05_leave/components/formDetail/formLeave.vue b/src/modules/05_leave/components/formDetail/01_SickForm.vue
similarity index 93%
rename from src/modules/05_leave/components/formDetail/formLeave.vue
rename to src/modules/05_leave/components/formDetail/01_SickForm.vue
index 7231a06..cdf2077 100644
--- a/src/modules/05_leave/components/formDetail/formLeave.vue
+++ b/src/modules/05_leave/components/formDetail/01_SickForm.vue
@@ -33,7 +33,7 @@ const props = defineProps({
       <div class="row">
         <div class="col text-grey-8">จำนวนวันที่ลา</div>
         <div class="col">
-          {{ props.data.leaveTotal ? props.data.leaveTotal : "-" }}
+          {{ props.data.leaveRange == 'ALL' ? props.data.leaveTotal + ' วัน' : props.data.leaveRange == 'MORNING' ? 'ลาครึ่งวันเช้า (0.5)': 'ลาครึ่งวันบ่าย (0.5)' }}
         </div>
       </div>
       <div class="row">
diff --git a/src/modules/05_leave/components/formDetail/formChildbirth.vue b/src/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue
similarity index 97%
rename from src/modules/05_leave/components/formDetail/formChildbirth.vue
rename to src/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue
index 8449389..596511e 100644
--- a/src/modules/05_leave/components/formDetail/formChildbirth.vue
+++ b/src/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue
@@ -32,7 +32,7 @@ const props = defineProps({
       <div class="row">
         <div class="col text-grey-8">จำนวนวันที่ลา</div>
         <div class="col">
-          {{ props.data.leaveCount ? props.data.leaveCount : "-" }}
+          {{ props.data.leaveTotal ? props.data.leaveTotal + " วัน" : "-" }}
         </div>
       </div>
       <div class="row">
diff --git a/src/modules/05_leave/components/formDetail/formHoliday.vue b/src/modules/05_leave/components/formDetail/05_VacationForm.vue
similarity index 94%
rename from src/modules/05_leave/components/formDetail/formHoliday.vue
rename to src/modules/05_leave/components/formDetail/05_VacationForm.vue
index f8e7a19..38db660 100644
--- a/src/modules/05_leave/components/formDetail/formHoliday.vue
+++ b/src/modules/05_leave/components/formDetail/05_VacationForm.vue
@@ -41,7 +41,7 @@ const props = defineProps({
       <div class="row">
         <div class="col text-grey-8">จำนวนวันที่ลา</div>
         <div class="col">
-          {{ props.data.leaveCount ? props.data.leaveCount : "-" }}
+          {{ props.data.leaveRange == 'ALL' ? props.data.leaveTotal + ' วัน' : props.data.leaveRange == 'MORNING' ? 'ลาครึ่งวันเช้า (0.5)': 'ลาครึ่งวันบ่าย (0.5)' }}
         </div>
       </div>
       <div class="row">
diff --git a/src/modules/05_leave/components/formDetail/formUpasom.vue b/src/modules/05_leave/components/formDetail/06_OrdinationForm.vue
similarity index 100%
rename from src/modules/05_leave/components/formDetail/formUpasom.vue
rename to src/modules/05_leave/components/formDetail/06_OrdinationForm.vue
diff --git a/src/modules/05_leave/components/formDetail/formHajj.vue b/src/modules/05_leave/components/formDetail/07_HajjForm.vue
similarity index 100%
rename from src/modules/05_leave/components/formDetail/formHajj.vue
rename to src/modules/05_leave/components/formDetail/07_HajjForm.vue
diff --git a/src/modules/05_leave/components/formDetail/formCheckSelect.vue b/src/modules/05_leave/components/formDetail/08_MilitaryForm.vue
similarity index 100%
rename from src/modules/05_leave/components/formDetail/formCheckSelect.vue
rename to src/modules/05_leave/components/formDetail/08_MilitaryForm.vue
diff --git a/src/modules/05_leave/interface/response/leave.ts b/src/modules/05_leave/interface/response/leave.ts
index 3b9427b..3f4a2a4 100644
--- a/src/modules/05_leave/interface/response/leave.ts
+++ b/src/modules/05_leave/interface/response/leave.ts
@@ -79,6 +79,7 @@ interface FremDetail {
 	coupleDaySumTotalHistory: string //ประวัติ ในกรณีลาติดต่อกับครั้งก่อน รวมทั้งนี้ด้วย เป็นเวลา กี่ปี กี่เดือน กี่วัน (ลาติดตามคู่สมรส)
 	approveStep: string
 	dear: string
+	leaveRange: string
 }
 
 interface FromCancelDetail {
diff --git a/src/modules/05_leave/views/EditPage.vue b/src/modules/05_leave/views/EditPage.vue
index fe02c81..1eb1f97 100644
--- a/src/modules/05_leave/views/EditPage.vue
+++ b/src/modules/05_leave/views/EditPage.vue
@@ -102,6 +102,7 @@ const formData = reactive<any>({
   approveStep: "",
   dear: "",
   leaveLast: "",
+  leaveRange: "",
 });
 
 /**
@@ -156,8 +157,7 @@ async function fetchDataDetail(id: string) {
       formData.ordainDayLocationName = data.ordainDayLocationName ?? "-";
       formData.ordainDayLocationAddress = data.ordainDayLocationAddress ?? "-";
       formData.ordainDayLocationNumber = data.ordainDayLocationNumber ?? "-";
-      formData.ordainDayOrdination =
-        data.ordainDayOrdination && date2Thai(data.ordainDayOrdination);
+      formData.ordainDayOrdination = data.ordainDayOrdination;
       formData.ordainDayBuddhistLentName =
         data.ordainDayBuddhistLentName ?? "-";
       formData.ordainDayBuddhistLentAddress =
@@ -165,8 +165,7 @@ async function fetchDataDetail(id: string) {
       formData.hajjDayStatus = data.hajjDayStatus;
       formData.absentDaySummon = data.absentDaySummon ?? "-";
       formData.absentDayLocation = data.absentDayLocation ?? "-";
-      formData.absentDayRegistorDate =
-        data.absentDayRegistorDate && date2Thai(data.absentDayRegistorDate);
+      formData.absentDayRegistorDate = data.absentDayRegistorDate;
       formData.absentDayGetIn = data.absentDayGetIn ?? "-";
       formData.absentDayAt = data.absentDayAt ?? "-";
       formData.studyDaySubject = data.studyDaySubject ?? "-";
@@ -189,6 +188,8 @@ async function fetchDataDetail(id: string) {
       formData.approveStep = data.approveStep ?? "-";
       formData.dear = data.dear ?? "-";
       formData.leaveLast = data.leaveLast ?? "-";
+      formData.leaveRange = data.leaveRange;
+      
       // checkLeaveType(formData.leaveTypeId, formData.leaveTypeName)
 
       dataStore.fetchProfileOld(data);
diff --git a/src/modules/07_appealComplain/views/Edit.vue b/src/modules/07_appealComplain/views/Edit.vue
index 8c825be..7b49ad0 100644
--- a/src/modules/07_appealComplain/views/Edit.vue
+++ b/src/modules/07_appealComplain/views/Edit.vue
@@ -86,7 +86,7 @@ async function getReport(fileName: string) {
     .get(config.API.appealByPrintReport(id.value))
     .then(async (res) => {
       console.log(res.data.result.data);
-      const data = res.data.result
+      const data = res.data.result;
       await genReport(data, fileName);
     })
     .catch((e) => {
@@ -114,7 +114,7 @@ onMounted(() => {
           flat
           color="primary"
           class="q-mr-sm"
-          @click="router.go(-1)"
+          @click="router.push('/appeal-complain')"
         />
         แก้ไขอุทธรณ์/ร้องทุกข์
       </div>