diff --git a/src/modules/05_leave/components/Forms/01_SickForm.vue b/src/modules/05_leave/components/Forms/01_SickForm.vue
index d44b384..a9cb73e 100644
--- a/src/modules/05_leave/components/Forms/01_SickForm.vue
+++ b/src/modules/05_leave/components/Forms/01_SickForm.vue
@@ -1,424 +1,510 @@
 <script setup lang="ts">
-import { ref, reactive, watch, computed } from "vue"
-import type { FormData, FormRef } from "@/modules/05_leave/interface/request/SickForm"
-import { useCounterMixin } from "@/stores/mixin"
-import { useLeaveStore } from "@/modules/05_leave/store"
-import http from "@/plugins/http"
-import config from "@/app.config"
-import { useQuasar } from "quasar"
-import { useRouter } from "vue-router"
+import { ref, reactive, watch, computed } from "vue";
+import type {
+  FormData,
+  FormRef,
+} from "@/modules/05_leave/interface/request/SickForm";
+import { useCounterMixin } from "@/stores/mixin";
+import { useLeaveStore } from "@/modules/05_leave/store";
+import http from "@/plugins/http";
+import config from "@/app.config";
+import { useQuasar } from "quasar";
+import { useRouter } from "vue-router";
 
 /** Use */
-const dataStore = useLeaveStore()
-const $q = useQuasar()
-const mixin = useCounterMixin()
-const router = useRouter()
-const { date2Thai, dateToISO, dialogConfirm, success, messageError, fails } = mixin
-const edit = ref<boolean>(true)
+const dataStore = useLeaveStore();
+const $q = useQuasar();
+const mixin = useCounterMixin();
+const router = useRouter();
+const {
+  date2Thai,
+  dateToISO,
+  dialogConfirm,
+  success,
+  messageError,
+  fails,
+  showLoader,
+  hideLoader,
+} = mixin;
+const edit = ref<boolean>(true);
 
 /** รับ props มาจากหน้าหลัก */
 const props = defineProps({
-	data: {
-		type: Object,
-		default: null,
-	},
-	onSubmit: {
-		type: Function,
-		default: () => "",
-	},
-})
+  data: {
+    type: Object,
+    default: null,
+  },
+  onSubmit: {
+    type: Function,
+    default: () => "",
+  },
+});
 
 /** ข้อมูล v-model ของฟอร์ม */
 const formDataSick = reactive<any>({
-	type: dataStore.typeId,
-	leaveWrote: "",
-	leaveStartDate: null,
-	leaveEndDate: null,
-	halfDay: "day",
-	leaveTotal: "",
-	leaveLast: null,
-	leaveNumber: "",
-	leaveAddress: "",
-	leaveDetail: "",
-	leaveDocument: [],
-})
+  type: dataStore.typeId,
+  leaveWrote: "",
+  leaveStartDate: null,
+  leaveEndDate: null,
+  halfDay: "day",
+  leaveTotal: "",
+  leaveLast: null,
+  leaveNumber: "",
+  leaveAddress: "",
+  leaveDetail: "",
+  leaveDocument: [],
+});
 
 /** ตัวแปร ref สำหรับแสดง validate */
-const leaveWroteRef = ref<object | null>(null)
-const leaveStartDateRef = ref<object | null>(null)
-const leaveEndDateRef = ref<object | null>(null)
-const halfDayRef = ref<object | null>(null)
-const leaveTotalRef = ref<object | null>(null)
-const leaveLastRef = ref<object | null>(null)
-const leaveNumberRef = ref<object | null>(null)
-const leaveAddressRef = ref<object | null>(null)
-const leaveDetailRef = ref<object | null>(null)
+const leaveWroteRef = ref<object | null>(null);
+const leaveStartDateRef = ref<object | null>(null);
+const leaveEndDateRef = ref<object | null>(null);
+const halfDayRef = ref<object | null>(null);
+const leaveTotalRef = ref<object | null>(null);
+const leaveLastRef = ref<object | null>(null);
+const leaveNumberRef = ref<object | null>(null);
+const leaveAddressRef = ref<object | null>(null);
+const leaveDetailRef = ref<object | null>(null);
 
 /** maping ref เข้าตัวแปรเพื่อเตรียมตรวจสอบ */
 const FormRef: FormRef = {
-	leaveWrote: leaveWroteRef,
-	leaveStartDate: leaveStartDateRef,
-	leaveEndDate: leaveEndDateRef,
-	halfDay: halfDayRef,
-	leaveTotal: leaveTotalRef,
-	leaveNumber: leaveNumberRef,
-	leaveAddress: leaveAddressRef,
-	leaveDetail: leaveDetailRef,
-}
+  leaveWrote: leaveWroteRef,
+  leaveStartDate: leaveStartDateRef,
+  leaveEndDate: leaveEndDateRef,
+  halfDay: halfDayRef,
+  leaveTotal: leaveTotalRef,
+  leaveNumber: leaveNumberRef,
+  leaveAddress: leaveAddressRef,
+  leaveDetail: leaveDetailRef,
+};
 
 /** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาที่ฟอร์มไหม เมื่อมีการส่งจะ map ข้อมูลเข้า v-model ของฟอร์ม */
 watch(props.data, async () => {
-	// console.log("data==>", props.data)
-	formDataSick.leaveWrote = props.data.leaveWrote
-	formDataSick.leaveStartDate = props.data.leaveStartDate
-	formDataSick.leaveEndDate = props.data.leaveEndDate
-	formDataSick.contractTel = props.data.contractTel
-	formDataSick.leaveTotal = props.data.leaveTotal
-	formDataSick.leaveNumber = props.data.leaveNumber
-	formDataSick.leaveDetail = props.data.leaveDetail
-	formDataSick.leaveDocument = props.data.leaveDocument
-})
+  // console.log("data==>", props.data)
+  formDataSick.leaveWrote = props.data.leaveWrote;
+  formDataSick.leaveStartDate = props.data.leaveStartDate;
+  formDataSick.leaveEndDate = props.data.leaveEndDate;
+  formDataSick.contractTel = props.data.contractTel;
+  formDataSick.leaveTotal = props.data.leaveTotal;
+  formDataSick.leaveNumber = props.data.leaveNumber;
+  formDataSick.leaveDetail = props.data.leaveDetail;
+  formDataSick.leaveDocument = props.data.leaveDocument;
+});
 
 /** ส่วนของการประกาศและเลือกไฟล์เอกสารประกอบ */
-const nameFile = ref<string>("")
-const fileDocDataUpload = ref<File[]>([])
+const nameFile = ref<string>("");
+const fileDocDataUpload = ref<File[]>([]);
 async function fileUploadDoc(files: any) {
-	files.forEach((file: any) => {
-		fileDocDataUpload.value.push(file)
-	})
+  files.forEach((file: any) => {
+    fileDocDataUpload.value.push(file);
+  });
 }
 
 /**
  * function รีเซทค่า leaveStartDate เเละ leaveEndDate
  */
 function resetDate() {
-	if (formDataSick.halfDay === "half_day_morning" || formDataSick.halfDay === "half_day_afternoon") {
-		formDataSick.leaveStartDate = null
-		formDataSick.leaveEndDate = null
-	}
-	console.log("testnull")
+  if (
+    formDataSick.halfDay === "half_day_morning" ||
+    formDataSick.halfDay === "half_day_afternoon"
+  ) {
+    formDataSick.leaveStartDate = null;
+    formDataSick.leaveEndDate = null;
+  }
+  console.log("testnull");
 }
 
 /** ฟังก์ชั่นตรวจสอบความถูกต้องของข้อมูลในฟอร์ม */
 function onValidate() {
-	const hasError = []
-	for (const key in FormRef) {
-		if (Object.prototype.hasOwnProperty.call(FormRef, key)) {
-			const property = FormRef[key]
-			if (property.value && typeof property.value.validate === "function") {
-				const isValid = property.value.validate()
-				hasError.push(isValid)
-			}
-		}
-	}
-	if (hasError.every(result => result === true)) {
-		onSubmit()
-	}
+  const hasError = [];
+  for (const key in FormRef) {
+    if (Object.prototype.hasOwnProperty.call(FormRef, key)) {
+      const property = FormRef[key];
+      if (property.value && typeof property.value.validate === "function") {
+        const isValid = property.value.validate();
+        hasError.push(isValid);
+      }
+    }
+  }
+  if (hasError.every((result) => result === true)) {
+    onSubmit();
+  }
 }
 
 /** ฟังก์ชั่น บันทึก */
 const onSubmit = async () => {
-	dialogConfirm(
-		$q,
-		async () => {
-			await saveFormData()
-		},
-		"ยืนยันการยื่นใบลา",
-		"ต้องการยืนยันการยื่นใบลานี้ใช่หรือไม่ ?"
-	)
-}
+  dialogConfirm(
+    $q,
+    async () => {
+      await saveFormData();
+    },
+    "ยืนยันการยื่นใบลา",
+    "ต้องการยืนยันการยื่นใบลานี้ใช่หรือไม่ ?"
+  );
+};
 
 /**
  * ฟังชั่นบันทีกข้อมูลจาก formdata ส่งไปที่ Api
  */
 async function saveFormData() {
-	const formData = new FormData()
-	if (formDataSick.leaveDocument.length > 0) {
-		const blob = formDataSick.leaveDocument.slice(0, formDataSick.leaveDocument[0].size)
-		const newFile = new File(blob, nameFile.value, {
-			type: formDataSick.leaveDocument[0].type,
-		})
-		formData.append("leaveDocument", newFile)
-	}
+  showLoader();
+  const formData = new FormData();
+  //   if (formDataSick.leaveDocument.length > 0) {
+  //     const blob = formDataSick.leaveDocument.slice(
+  //       0,
+  //       formDataSick.leaveDocument[0].size
+  //     );
+  //     const newFile = new File(blob, nameFile.value, {
+  //       type: formDataSick.leaveDocument[0].type,
+  //     });
+  //     formData.append("leaveDocument", newFile);
+  //   }
 
-	formData.append("type", formDataSick.type)
-	formData.append("leaveStartDate", dateToISO(formDataSick.leaveStartDate))
-	formData.append("leaveEndDate", dateToISO(formDataSick.leaveEndDate))
-	formData.append("leaveWrote", formDataSick.leaveWrote)
-	formData.append("leaveAddress", formDataSick.leaveAddress)
-	formData.append("leaveNumber", formDataSick.leaveNumber)
-	formData.append("leaveDetail", formDataSick.leaveDetail)
-	await http
-		.post(config.API.leaveUser(), formData)
-		.then((res: any) => {
-			success($q, "บันทึกสำเร็จ")
-			router.push(`/leave`)
-		})
-		.catch((e: any) => {
-			messageError($q, e)
-		})
+  formData.append("leaveDocument", formDataSick.leaveDocument);
+  formData.append("type", formDataSick.type);
+  formData.append("leaveStartDate", dateToISO(formDataSick.leaveStartDate));
+  formData.append("leaveEndDate", dateToISO(formDataSick.leaveEndDate));
+  formData.append("leaveWrote", formDataSick.leaveWrote);
+  formData.append("leaveAddress", formDataSick.leaveAddress);
+  formData.append("leaveNumber", formDataSick.leaveNumber);
+  formData.append("leaveDetail", formDataSick.leaveDetail);
+  await http
+    .post(config.API.leaveUser(), formData)
+    .then(() => {
+      success($q, "บันทึกสำเร็จ");
+      router.push(`/leave`);
+    })
+    .catch((e: any) => {
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
+    });
 }
 
 /**
  * check ว่าลาได้ไหม จาก api
  * @param formData
  */
-const isLeave = ref<boolean>(true)
+const isLeave = ref<boolean>(true);
 async function FetchCheck() {
-	await http
-		.post(config.API.leaveCheck(), { type: dataStore.typeId ?? null, StartLeaveDate: formDataSick.leaveStartDate ?? null, EndLeaveDate: formDataSick.leaveEndDate ?? null })
-		.then((res: any) => {
-			const data = res.data.result
-			isLeave.value = data.isLeave
-			if (data.isLeave === true) {
-				formDataSick.leaveTotal = data.totalDate - data.sumDateWork - data.sumDateHoliday
-			} else {
-				fails($q, "ไม่สามารถลาได้")
-			}
-		})
-		.catch((e: any) => {
-			messageError($q, e)
-		})
+  await http
+    .post(config.API.leaveCheck(), {
+      type: dataStore.typeId ?? null,
+      StartLeaveDate: formDataSick.leaveStartDate ?? null,
+      EndLeaveDate: formDataSick.leaveEndDate ?? null,
+    })
+    .then((res: any) => {
+      const data = res.data.result;
+      isLeave.value = data.isLeave;
+      if (data.isLeave === true) {
+        formDataSick.leaveTotal =
+          data.totalDate - data.sumDateWork - data.sumDateHoliday;
+      } else {
+        fails($q, "ไม่สามารถลาได้");
+      }
+    })
+    .catch((e: any) => {
+      messageError($q, e);
+    });
 }
 
 /**
  * ฟังก์ชั่นแปลงครึ่งวัน/ทั้งวัน
  */
 const isReadOnly = computed(() => {
-	const conditionHalfDay = formDataSick.halfDay === "half_day_morning" || formDataSick.halfDay === "half_day_afternoon"
-	if (conditionHalfDay) {
-		formDataSick.leaveEndDate = formDataSick.leaveStartDate // Set formDataSick.leaveEndDate to null
-		formDataSick.leaveTotal = "0.5 วัน "
-	} else {
-		formDataSick.leaveTotal = null
-	}
-	return conditionHalfDay
-})
+  const conditionHalfDay =
+    formDataSick.halfDay === "half_day_morning" ||
+    formDataSick.halfDay === "half_day_afternoon";
+  if (conditionHalfDay) {
+    formDataSick.leaveEndDate = formDataSick.leaveStartDate; // Set formDataSick.leaveEndDate to null
+    formDataSick.leaveTotal = "0.5 วัน ";
+  } else {
+    formDataSick.leaveTotal = null;
+  }
+  return conditionHalfDay;
+});
 </script>
 
 <!-- ฟอร์มลาป่วย และลากิจส่วนตัว -->
 <template>
-	<div style="display: flex; align-items: center">
-		<q-icon name="mdi-numeric-3-circle" size="20px" color="primary" />
-		<div class="q-pl-sm text-weight-bold text-dark">กรอกข้อมูล</div>
-	</div>
-	<form @submit.prevent.stop="onValidate">
-		<q-card bordered class="q-pa-md bg-grey-1">
-			<div class="col-12 row q-pa-sm q-col-gutter-sm">
-				<q-input
-					class="col-12 col-sm-12"
-					ref="leaveWroteRef"
-					for="leaveWroteRef"
-					dense
-					hide-bottom-space
-					bg-color="white"
-					outlined
-					v-model="formDataSick.leaveWrote"
-					label="เขียนที่"
-					:readonly="!edit"
-					:rules="[val => !!val || `${'เขียนที่'}`]"
-				/>
+  <div style="display: flex; align-items: center">
+    <q-icon name="mdi-numeric-3-circle" size="20px" color="primary" />
+    <div class="q-pl-sm text-weight-bold text-dark">กรอกข้อมูล</div>
+  </div>
+  <form @submit.prevent.stop="onValidate">
+    <q-card bordered class="q-pa-md bg-grey-1">
+      <div class="col-12 row q-pa-sm q-col-gutter-sm">
+        <q-input
+          class="col-12 col-sm-12"
+          ref="leaveWroteRef"
+          for="leaveWroteRef"
+          dense
+          hide-bottom-space
+          bg-color="white"
+          outlined
+          v-model="formDataSick.leaveWrote"
+          label="เขียนที่"
+          :readonly="!edit"
+          :rules="[(val) => !!val || `${'เขียนที่'}`]"
+        />
 
-				<div class="col-12 col-md-4 col-sm-12">
-					<q-radio v-model="formDataSick.halfDay" val="day" label="ลาทั้งวัน" checked-icon="task_alt" />
-					<q-radio v-model="formDataSick.halfDay" val="half_day_morning" label="ลาครึ่งวันเช้า" checked-icon="task_alt" @update:model-value="resetDate" />
-					<q-radio v-model="formDataSick.halfDay" val="half_day_afternoon" label="ลาครึ่งวันบ่าย" checked-icon="task_alt" @update:model-value="resetDate" />
-				</div>
-				<div class="full-width">
-					<div class="q-col-gutter-sm row">
-						<datepicker
-							class="col-12 col-md-3 col-sm-6"
-							menu-class-name="modalfix"
-							v-model="formDataSick.leaveStartDate"
-							:locale="'th'"
-							autoApply
-							borderless
-							:enableTimePicker="false"
-							week-start="0"
-							:readonly="!edit"
-						>
-							<template #year="{ year }">
-								{{ year + 543 }}
-							</template>
-							<template #year-overlay-value="{ value }">
-								{{ parseInt(value + 543) }}
-							</template>
-							<template #trigger>
-								<q-input
-									outlined
-									dense
-									ref="leaveStartDateRef"
-									for="leaveStartDateRef"
-									hide-bottom-space
-									:readonly="!edit"
-									bg-color="white"
-									class="full-width datepicker"
-									:model-value="formDataSick.leaveStartDate != null ? date2Thai(formDataSick.leaveStartDate) : 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 class="col-12 col-md-4 col-sm-12">
+          <q-radio
+            v-model="formDataSick.halfDay"
+            val="day"
+            label="ลาทั้งวัน"
+            checked-icon="task_alt"
+          />
+          <q-radio
+            v-model="formDataSick.halfDay"
+            val="half_day_morning"
+            label="ลาครึ่งวันเช้า"
+            checked-icon="task_alt"
+            @update:model-value="resetDate"
+          />
+          <q-radio
+            v-model="formDataSick.halfDay"
+            val="half_day_afternoon"
+            label="ลาครึ่งวันบ่าย"
+            checked-icon="task_alt"
+            @update:model-value="resetDate"
+          />
+        </div>
+        <div class="full-width">
+          <div class="q-col-gutter-sm row">
+            <datepicker
+              class="col-12 col-md-3 col-sm-6"
+              menu-class-name="modalfix"
+              v-model="formDataSick.leaveStartDate"
+              :locale="'th'"
+              autoApply
+              borderless
+              :enableTimePicker="false"
+              week-start="0"
+              :readonly="!edit"
+            >
+              <template #year="{ year }">
+                {{ year + 543 }}
+              </template>
+              <template #year-overlay-value="{ value }">
+                {{ parseInt(value + 543) }}
+              </template>
+              <template #trigger>
+                <q-input
+                  outlined
+                  dense
+                  ref="leaveStartDateRef"
+                  for="leaveStartDateRef"
+                  hide-bottom-space
+                  :readonly="!edit"
+                  bg-color="white"
+                  class="full-width datepicker"
+                  :model-value="
+                    formDataSick.leaveStartDate != null
+                      ? date2Thai(formDataSick.leaveStartDate)
+                      : 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>
 
-						<datepicker
-							class="col-12 col-md-3 col-sm-6"
-							menu-class-name="modalfix"
-							v-model="formDataSick.leaveEndDate"
-							:locale="'th'"
-							autoApply
-							borderless
-							:enableTimePicker="false"
-							week-start="0"
-							:readonly="isReadOnly"
-							@update:model-value="FetchCheck()"
-							:min-date="formDataSick.leaveStartDate ? new Date(formDataSick.leaveStartDate.getTime() * 60 * 60 * 1000) : null"
-						>
-							<template #year="{ year }">
-								{{ year + 543 }}
-							</template>
-							<template #year-overlay-value="{ value }">
-								{{ parseInt(value + 543) }}
-							</template>
-							<template #trigger>
-								<q-input
-									outlined
-									dense
-									ref="leaveEndDateRef"
-									for="leaveEndDateRef"
-									hide-bottom-space
-									bg-color="white"
-									:readonly="isReadOnly"
-									class="full-width datepicker"
-									:model-value="formDataSick.leaveEndDate != null ? date2Thai(formDataSick.leaveEndDate) : 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>
-						<q-input
-							class="col-12 col-md-3 col-sm-6"
-							dense
-							bg-color="white"
-							outlined
-							ref="leaveTotalRef"
-							for="leaveTotalRef"
-							v-model="formDataSick.leaveTotal"
-							label="จำนวนวันที่ลา"
-							readonly
-							hide-bottom-space
-						/>
-						<q-input
-							class="col-12 col-md-3 col-sm-6"
-							dense
-							outlined
-							ref="leaveLastRef"
-							for="leaveLastRef"
-							v-model="dataStore.leaveLast"
-							label="ลาครั้งสุดท้ายเมื่อวันที่"
-							readonly
-							hide-bottom-space
-							bg-color="white"
-						/>
-					</div>
-				</div>
-				<div class="full-width">
-					<div class="q-col-gutter-sm row">
-						<q-input
-							class="col-12 col-md-3 col-sm-6"
-							dense
-							outlined
-							ref="leaveNumberRef"
-							for="leaveNumberRef"
-							v-model="formDataSick.leaveNumber"
-							mask="(###)-###-####"
-							hide-bottom-space
-							bg-color="white"
-							unmasked-value
-							label="หมายเลขโทรศัพท์ที่ติดต่อได้"
-							:readonly="!edit"
-							:rules="[val => !!val || `${'กรุณากรอกหมายเลขโทรศัพท์ที่ติดต่อได้'}`]"
-						/>
+            <datepicker
+              class="col-12 col-md-3 col-sm-6"
+              menu-class-name="modalfix"
+              v-model="formDataSick.leaveEndDate"
+              :locale="'th'"
+              autoApply
+              borderless
+              :enableTimePicker="false"
+              week-start="0"
+              :readonly="isReadOnly"
+              @update:model-value="FetchCheck()"
+              :min-date="
+                formDataSick.leaveStartDate
+                  ? new Date(
+                      formDataSick.leaveStartDate.getTime() * 60 * 60 * 1000
+                    )
+                  : null
+              "
+            >
+              <template #year="{ year }">
+                {{ year + 543 }}
+              </template>
+              <template #year-overlay-value="{ value }">
+                {{ parseInt(value + 543) }}
+              </template>
+              <template #trigger>
+                <q-input
+                  outlined
+                  dense
+                  ref="leaveEndDateRef"
+                  for="leaveEndDateRef"
+                  hide-bottom-space
+                  bg-color="white"
+                  :readonly="isReadOnly"
+                  class="full-width datepicker"
+                  :model-value="
+                    formDataSick.leaveEndDate != null
+                      ? date2Thai(formDataSick.leaveEndDate)
+                      : 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>
+            <q-input
+              class="col-12 col-md-3 col-sm-6"
+              dense
+              bg-color="white"
+              outlined
+              ref="leaveTotalRef"
+              for="leaveTotalRef"
+              v-model="formDataSick.leaveTotal"
+              label="จำนวนวันที่ลา"
+              readonly
+              hide-bottom-space
+            />
+            <q-input
+              class="col-12 col-md-3 col-sm-6"
+              dense
+              outlined
+              ref="leaveLastRef"
+              for="leaveLastRef"
+              v-model="dataStore.leaveLast"
+              label="ลาครั้งสุดท้ายเมื่อวันที่"
+              readonly
+              hide-bottom-space
+              bg-color="white"
+            />
+          </div>
+        </div>
+        <div class="full-width">
+          <div class="q-col-gutter-sm row">
+            <q-input
+              class="col-12 col-md-3 col-sm-6"
+              dense
+              outlined
+              ref="leaveNumberRef"
+              for="leaveNumberRef"
+              v-model="formDataSick.leaveNumber"
+              mask="(###)-###-####"
+              hide-bottom-space
+              bg-color="white"
+              unmasked-value
+              label="หมายเลขโทรศัพท์ที่ติดต่อได้"
+              :readonly="!edit"
+              :rules="[
+                (val) => !!val || `${'กรุณากรอกหมายเลขโทรศัพท์ที่ติดต่อได้'}`,
+              ]"
+            />
 
-						<q-input
-							class="col-12 col-md-9 col-sm-6"
-							dense
-							outlined
-							ref="leaveAddressRef"
-							for="leaveAddressRef"
-							v-model="formDataSick.leaveAddress"
-							label="ที่อยู่ที่ติดต่อได้ระหว่างลา"
-							:readonly="!edit"
-							:rules="[val => !!val || `${'กรุณากรอกที่อยู่ที่ติดต่อได้ระหว่างลา'}`]"
-							hide-bottom-space
-							bg-color="white"
-						/>
-					</div>
-				</div>
-				<q-input
-					type="textarea"
-					class="col-12 col-md-12 col-sm-12"
-					dense
-					outlined
-					ref="leaveDetailRef"
-					for="leaveDetailRef"
-					v-model="formDataSick.leaveDetail"
-					label="รายละเอียด"
-					:readonly="!edit"
-					bg-color="white"
-				/>
-				<div class="full-width">
-					<div class="q-col-gutter-sm row">
-						<q-file
-							for="leaveDocumentRef"
-							v-model="formDataSick.leaveDocument"
-							@added="fileUploadDoc"
-							dense
-							label="เอกสารประกอบ"
-							outlined
-							use-chips
-							multiple
-							bg-color="white"
-							class="col-12 q-pl-sm col-12"
-						>
-							<template v-slot:prepend>
-								<q-icon name="attach_file" color="primary" />
-							</template>
-						</q-file>
-					</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 formDataSick.leaveDocument" :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-input
+              class="col-12 col-md-9 col-sm-6"
+              dense
+              outlined
+              ref="leaveAddressRef"
+              for="leaveAddressRef"
+              v-model="formDataSick.leaveAddress"
+              label="ที่อยู่ที่ติดต่อได้ระหว่างลา"
+              :readonly="!edit"
+              :rules="[
+                (val) => !!val || `${'กรุณากรอกที่อยู่ที่ติดต่อได้ระหว่างลา'}`,
+              ]"
+              hide-bottom-space
+              bg-color="white"
+            />
+          </div>
+        </div>
+        <q-input
+          type="textarea"
+          class="col-12 col-md-12 col-sm-12"
+          dense
+          outlined
+          ref="leaveDetailRef"
+          for="leaveDetailRef"
+          v-model="formDataSick.leaveDetail"
+          label="รายละเอียด"
+          :readonly="!edit"
+          bg-color="white"
+        />
+        <div class="full-width">
+          <div class="q-col-gutter-sm row">
+            <q-file
+              for="leaveDocumentRef"
+              v-model="formDataSick.leaveDocument"
+              dense
+              label="เอกสารประกอบ"
+              outlined
+              use-chips
+              bg-color="white"
+              class="col-12 q-pl-sm col-12"
+            >
+              <template v-slot:prepend>
+                <q-icon name="attach_file" color="primary" />
+              </template>
+            </q-file>
+          </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 formDataSick.leaveDocument"
+                :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" />
+    <q-separator class="q-mt-sm" />
 
-		<div class="row col-12 q-pt-md">
-			<q-space />
-			<q-btn id="onSubmit" type="submit" unelevated dense class="q-px-md items-center btnBlue" label="ยื่นใบลา" />
-		</div>
-	</form>
+    <div class="row col-12 q-pt-md">
+      <q-space />
+      <q-btn
+        id="onSubmit"
+        type="submit"
+        unelevated
+        dense
+        class="q-px-md items-center btnBlue"
+        label="ยื่นใบลา"
+      />
+    </div>
+  </form>
 </template>
diff --git a/src/modules/05_leave/components/Forms/03_Birth.vue b/src/modules/05_leave/components/Forms/03_Birth.vue
index 9c5e23a..87d9f44 100644
--- a/src/modules/05_leave/components/Forms/03_Birth.vue
+++ b/src/modules/05_leave/components/Forms/03_Birth.vue
@@ -142,13 +142,14 @@ async function FetchCheck() {
  */
 async function saveFormData() {
 	const formData = new FormData()
-	if (formDataBirth.leaveDocument.length > 0) {
-		const blob = formDataBirth.leaveDocument.slice(0, formDataBirth.leaveDocument[0].size)
-		const newFile = new File(blob, nameFile.value, {
-			type: formDataBirth.leaveDocument[0].type,
-		})
-		formData.append("leaveDocument", newFile)
-	}
+	// if (formDataBirth.leaveDocument.length > 0) {
+	// 	const blob = formDataBirth.leaveDocument.slice(0, formDataBirth.leaveDocument[0].size)
+	// 	const newFile = new File(blob, nameFile.value, {
+	// 		type: formDataBirth.leaveDocument[0].type,
+	// 	})
+	// 	formData.append("leaveDocument", newFile)
+	// }
+	formData.append("leaveDocument", formDataBirth.leaveDocument)
 	formData.append("type", formDataBirth.type)
 	formData.append("leaveStartDate", dateToISO(formDataBirth.leaveStartDate))
 	formData.append("leaveEndDate", dateToISO(formDataBirth.leaveEndDate))
diff --git a/src/modules/05_leave/components/Forms/04_HelpWifeBirthForm.vue b/src/modules/05_leave/components/Forms/04_HelpWifeBirthForm.vue
index 88bf222..ff99117 100644
--- a/src/modules/05_leave/components/Forms/04_HelpWifeBirthForm.vue
+++ b/src/modules/05_leave/components/Forms/04_HelpWifeBirthForm.vue
@@ -158,13 +158,14 @@ async function FetchCheck() {
  */
 async function saveFormData() {
 	const formData = new FormData()
-	if (formDataHelpWife.leaveDocument.length > 0) {
-		const blob = formDataHelpWife.leaveDocument.slice(0, formDataHelpWife.leaveDocument[0].size)
-		const newFile = new File(blob, nameFile.value, {
-			type: formDataHelpWife.leaveDocument[0].type,
-		})
-		formData.append("leaveDocument", newFile)
-	}
+	// if (formDataHelpWife.leaveDocument.length > 0) {
+	// 	const blob = formDataHelpWife.leaveDocument.slice(0, formDataHelpWife.leaveDocument[0].size)
+	// 	const newFile = new File(blob, nameFile.value, {
+	// 		type: formDataHelpWife.leaveDocument[0].type,
+	// 	})
+	// 	formData.append("leaveDocument", newFile)
+	// }
+	formData.append("leaveDocument", formDataHelpWife.leaveDocument)
 	formData.append("type", formDataHelpWife.type)
 	formData.append("leaveStartDate", dateToISO(formDataHelpWife.leaveStartDate))
 	formData.append("leaveEndDate", dateToISO(formDataHelpWife.leaveEndDate))
diff --git a/src/modules/05_leave/components/Forms/05_VacationForm.vue b/src/modules/05_leave/components/Forms/05_VacationForm.vue
index 35ddcc4..6bbe8f5 100644
--- a/src/modules/05_leave/components/Forms/05_VacationForm.vue
+++ b/src/modules/05_leave/components/Forms/05_VacationForm.vue
@@ -154,13 +154,14 @@ async function FetchCheck() {
  */
 async function saveFormData() {
 	const formData = new FormData()
-	if (formDataVacation.leaveDocument.length > 0) {
-		const blob = formDataVacation.leaveDocument.slice(0, formDataVacation.leaveDocument[0].size)
-		const newFile = new File(blob, nameFile.value, {
-			type: formDataVacation.leaveDocument[0].type,
-		})
-		formData.append("leaveDocument", newFile)
-	}
+	// if (formDataVacation.leaveDocument.length > 0) {
+	// 	const blob = formDataVacation.leaveDocument.slice(0, formDataVacation.leaveDocument[0].size)
+	// 	const newFile = new File(blob, nameFile.value, {
+	// 		type: formDataVacation.leaveDocument[0].type,
+	// 	})
+	// 	formData.append("leaveDocument", newFile)
+	// }
+	formData.append("leaveDocument", formDataVacation.leaveDocument)
 	formData.append("type", formDataVacation.type)
 	formData.append("leaveStartDate", dateToISO(formDataVacation.leaveStartDate))
 	formData.append("leaveEndDate", dateToISO(formDataVacation.leaveEndDate))
diff --git a/src/modules/05_leave/components/Forms/06_OrdinationForm.vue b/src/modules/05_leave/components/Forms/06_OrdinationForm.vue
index b291952..d763984 100644
--- a/src/modules/05_leave/components/Forms/06_OrdinationForm.vue
+++ b/src/modules/05_leave/components/Forms/06_OrdinationForm.vue
@@ -157,13 +157,14 @@ async function FetchCheck() {
  */
 async function saveFormData() {
 	const formData = new FormData()
-	if (formDataOrdination.leaveDocument.length > 0) {
-		const blob = formDataOrdination.leaveDocument.slice(0, formDataOrdination.leaveDocument[0].size)
-		const newFile = new File(blob, nameFile.value, {
-			type: formDataOrdination.leaveDocument[0].type,
-		})
-		formData.append("leaveDocument", newFile)
-	}
+	// if (formDataOrdination.leaveDocument.length > 0) {
+	// 	const blob = formDataOrdination.leaveDocument.slice(0, formDataOrdination.leaveDocument[0].size)
+	// 	const newFile = new File(blob, nameFile.value, {
+	// 		type: formDataOrdination.leaveDocument[0].type,
+	// 	})
+	// 	formData.append("leaveDocument", newFile)
+	// }
+	formData.append("leaveDocument", formDataOrdination.leaveDocument)
 	formData.append("type", formDataOrdination.type)
 	formData.append("leaveStartDate", dateToISO(formDataOrdination.leaveStartDate))
 	formData.append("leaveEndDate", dateToISO(formDataOrdination.leaveEndDate))
@@ -337,7 +338,7 @@ function updateLeaveTotal() {
 									:rules="[val => !!val || `${'กรุณาเลือกวันที่เข้ารับราชการ'}`]"
 								>
 									<template v-slot:prepend>
-										<q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)"> </q-icon>
+										<q-icon name="event" class="cursor-pointer" style="color: var(--black)"> </q-icon>
 									</template>
 								</q-input>
 							</template>
@@ -374,7 +375,7 @@ function updateLeaveTotal() {
 									:rules="[val => !!val || `${'กรุณาเลือกลาตั้งแต่วันที่'}`]"
 								>
 									<template v-slot:prepend>
-										<q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)"> </q-icon>
+										<q-icon name="event" class="cursor-pointer" style="color: var(--black)"> </q-icon>
 									</template>
 								</q-input>
 							</template>
diff --git a/src/modules/05_leave/components/Forms/07_HajjForm.vue b/src/modules/05_leave/components/Forms/07_HajjForm.vue
index 4bef3c1..5e6b05b 100644
--- a/src/modules/05_leave/components/Forms/07_HajjForm.vue
+++ b/src/modules/05_leave/components/Forms/07_HajjForm.vue
@@ -123,13 +123,14 @@ async function FetchCheck() {
  */
 async function saveFormData() {
 	const formData = new FormData()
-	if (formDataHaji.leaveDocument.length > 0) {
-		const blob = formDataHaji.leaveDocument.slice(0, formDataHaji.leaveDocument[0].size)
-		const newFile = new File(blob, nameFile.value, {
-			type: formDataHaji.leaveDocument[0].type,
-		})
-		formData.append("leaveDocument", newFile)
-	}
+	// if (formDataHaji.leaveDocument.length > 0) {
+	// 	const blob = formDataHaji.leaveDocument.slice(0, formDataHaji.leaveDocument[0].size)
+	// 	const newFile = new File(blob, nameFile.value, {
+	// 		type: formDataHaji.leaveDocument[0].type,
+	// 	})
+	// 	formData.append("leaveDocument", newFile)
+	// }
+	formData.append("leaveDocument", formDataHaji.leaveDocument)
 	formData.append("type", formDataHaji.type)
 	formData.append("leaveStartDate", dateToISO(formDataHaji.leaveStartDate))
 	formData.append("leaveEndDate", dateToISO(formDataHaji.leaveEndDate))
@@ -299,7 +300,7 @@ function updateLeaveTotal() {
 									:rules="[val => !!val || `${'กรุณาเลือกวันที่เข้ารับราชการ'}`]"
 								>
 									<template v-slot:prepend>
-										<q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)"> </q-icon>
+										<q-icon name="event" class="cursor-pointer" style="color: var(--black)"> </q-icon>
 									</template>
 								</q-input>
 							</template>
diff --git a/src/modules/05_leave/components/Forms/08_MilitaryForm.vue b/src/modules/05_leave/components/Forms/08_MilitaryForm.vue
index d1be6ad..fee9550 100644
--- a/src/modules/05_leave/components/Forms/08_MilitaryForm.vue
+++ b/src/modules/05_leave/components/Forms/08_MilitaryForm.vue
@@ -135,13 +135,14 @@ async function FetchCheck() {
  */
 async function saveFormData() {
 	const formData = new FormData()
-	if (formDataMilitary.leaveDocument.length > 0) {
-		const blob = formDataMilitary.leaveDocument.slice(0, formDataMilitary.leaveDocument[0].size)
-		const newFile = new File(blob, nameFile.value, {
-			type: formDataMilitary.leaveDocument[0].type,
-		})
-		formData.append("leaveDocument", newFile)
-	}
+	// if (formDataMilitary.leaveDocument.length > 0) {
+	// 	const blob = formDataMilitary.leaveDocument.slice(0, formDataMilitary.leaveDocument[0].size)
+	// 	const newFile = new File(blob, nameFile.value, {
+	// 		type: formDataMilitary.leaveDocument[0].type,
+	// 	})
+	// 	formData.append("leaveDocument", newFile)
+	// }
+	formData.append("leaveDocument", formDataMilitary.leaveDocument)
 	formData.append("type", formDataMilitary.type)
 	formData.append("leaveStartDate", dateToISO(formDataMilitary.leaveStartDate))
 	formData.append("leaveEndDate", dateToISO(formDataMilitary.leaveEndDate))
diff --git a/src/modules/05_leave/components/Forms/09_StudyForm.vue b/src/modules/05_leave/components/Forms/09_StudyForm.vue
index f681ed1..35e346f 100644
--- a/src/modules/05_leave/components/Forms/09_StudyForm.vue
+++ b/src/modules/05_leave/components/Forms/09_StudyForm.vue
@@ -145,13 +145,14 @@ async function FetchCheck() {
 }
 async function saveFormData() {
 	const formData = new FormData()
-	if (formDataStudy.leaveDocument.length > 0) {
-		const blob = formDataStudy.leaveDocument.slice(0, formDataStudy.leaveDocument[0].size)
-		const newFile = new File(blob, nameFile.value, {
-			type: formDataStudy.leaveDocument[0].type,
-		})
-		formData.append("leaveDocument", newFile)
-	}
+	// if (formDataStudy.leaveDocument.length > 0) {
+	// 	const blob = formDataStudy.leaveDocument.slice(0, formDataStudy.leaveDocument[0].size)
+	// 	const newFile = new File(blob, nameFile.value, {
+	// 		type: formDataStudy.leaveDocument[0].type,
+	// 	})
+	// 	formData.append("leaveDocument", newFile)
+	// }
+	formData.append("leaveDocument", formDataStudy.leaveDocument)
 	formData.append("type", formDataStudy.type) //
 	formData.append("leaveStartDate", dateToISO(formDataStudy.leaveStartDate)) //
 	formData.append("leaveEndDate", dateToISO(formDataStudy.leaveEndDate)) //
@@ -337,7 +338,7 @@ const formattedleaveSalary = computed(() => {
 									:rules="[val => !!val || `${'กรุณาเลือกวันที่เข้ารับราชการ'}`]"
 								>
 									<template v-slot:prepend>
-										<q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)"> </q-icon>
+										<q-icon name="event" class="cursor-pointer" style="color: var(--black)"> </q-icon>
 									</template>
 								</q-input>
 							</template>
@@ -374,7 +375,7 @@ const formattedleaveSalary = computed(() => {
 									:rules="[val => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
 								>
 									<template v-slot:prepend>
-										<q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)"> </q-icon>
+										<q-icon name="event" class="cursor-pointer" style="color: var(--black)"> </q-icon>
 									</template>
 								</q-input>
 							</template>
diff --git a/src/modules/05_leave/components/Forms/10_TrainForm.vue b/src/modules/05_leave/components/Forms/10_TrainForm.vue
index ef195d4..ca261cf 100644
--- a/src/modules/05_leave/components/Forms/10_TrainForm.vue
+++ b/src/modules/05_leave/components/Forms/10_TrainForm.vue
@@ -144,13 +144,14 @@ async function FetchCheck() {
  */
 async function saveFormData() {
 	const formData = new FormData()
-	if (formDataTrain.leaveDocument.length > 0) {
-		const blob = formDataTrain.leaveDocument.slice(0, formDataTrain.leaveDocument[0].size)
-		const newFile = new File(blob, nameFile.value, {
-			type: formDataTrain.leaveDocument[0].type,
-		})
-		formData.append("leaveDocument", newFile)
-	} //
+	// if (formDataTrain.leaveDocument.length > 0) {
+	// 	const blob = formDataTrain.leaveDocument.slice(0, formDataTrain.leaveDocument[0].size)
+	// 	const newFile = new File(blob, nameFile.value, {
+	// 		type: formDataTrain.leaveDocument[0].type,
+	// 	})
+	// 	formData.append("leaveDocument", newFile)
+	// } //
+	formData.append("leaveDocument", formDataTrain.leaveDocument)
 	formData.append("type", formDataTrain.type) //
 	formData.append("leaveStartDate", dateToISO(formDataTrain.leaveStartDate)) //
 	formData.append("leaveEndDate", dateToISO(formDataTrain.leaveEndDate)) //
diff --git a/src/modules/05_leave/components/Forms/11_WorkInternationalForm.vue b/src/modules/05_leave/components/Forms/11_WorkInternationalForm.vue
index c284a91..1656d4b 100644
--- a/src/modules/05_leave/components/Forms/11_WorkInternationalForm.vue
+++ b/src/modules/05_leave/components/Forms/11_WorkInternationalForm.vue
@@ -138,22 +138,24 @@ async function FetchCheck() {
  */
 async function saveFormData() {
 	const formData = new FormData()
-	//
-	if (formDataWorkInternational.leaveDocument.length > 0) {
-		const blob = formDataWorkInternational.leaveDocument.slice(0, formDataWorkInternational.leaveDocument[0].size)
-		const newFile = new File(blob, nameFile.value, {
-			type: formDataWorkInternational.leaveDocument[0].type,
-		})
-		formData.append("leaveDocument", newFile)
-	}
-	//
-	if (formDataWorkInternational.leaveDraftDocument.length > 0) {
-		const blobDrafe = formDataWorkInternational.leaveDraftDocument.slice(0, formDataWorkInternational.leaveDraftDocument[0].size)
-		const newFileDraft = new File(blobDrafe, nameFileDraft.value, {
-			type: formDataWorkInternational.leaveDraftDocument[0].type,
-		})
-		formData.append("leaveDraftDocument", newFileDraft) //
-	}
+	// //
+	// if (formDataWorkInternational.leaveDocument.length > 0) {
+	// 	const blob = formDataWorkInternational.leaveDocument.slice(0, formDataWorkInternational.leaveDocument[0].size)
+	// 	const newFile = new File(blob, nameFile.value, {
+	// 		type: formDataWorkInternational.leaveDocument[0].type,
+	// 	})
+	// 	formData.append("leaveDocument", newFile)
+	// }
+	// //
+	// if (formDataWorkInternational.leaveDraftDocument.length > 0) {
+	// 	const blobDrafe = formDataWorkInternational.leaveDraftDocument.slice(0, formDataWorkInternational.leaveDraftDocument[0].size)
+	// 	const newFileDraft = new File(blobDrafe, nameFileDraft.value, {
+	// 		type: formDataWorkInternational.leaveDraftDocument[0].type,
+	// 	})
+	// 	formData.append("leaveDraftDocument", newFileDraft) //
+	// }
+	formData.append("leaveDocument", formDataWorkInternational.leaveDocument)
+	formData.append("leaveDraftDocument", formDataWorkInternational.leaveDraftDocument)
 	formData.append("type", formDataWorkInternational.type) //
 	formData.append("leaveStartDate", dateToISO(formDataWorkInternational.leaveStartDate)) //
 	formData.append("leaveEndDate", dateToISO(formDataWorkInternational.leaveEndDate)) //
diff --git a/src/modules/05_leave/components/Forms/12_FollowSpouseForm.vue b/src/modules/05_leave/components/Forms/12_FollowSpouseForm.vue
index ee2cf0d..8114776 100644
--- a/src/modules/05_leave/components/Forms/12_FollowSpouseForm.vue
+++ b/src/modules/05_leave/components/Forms/12_FollowSpouseForm.vue
@@ -170,13 +170,14 @@ async function FetchCheck() {
  */
 async function saveFormData() {
 	const formData = new FormData()
-	if (formDataFollowSpouse.leaveDocument.length > 0) {
-		const blob = formDataFollowSpouse.leaveDocument.slice(0, formDataFollowSpouse.leaveDocument[0].size)
-		const newFile = new File(blob, nameFile.value, {
-			type: formDataFollowSpouse.leaveDocument[0].type,
-		})
-		formData.append("leaveDocument", newFile)
-	} //
+	// if (formDataFollowSpouse.leaveDocument.length > 0) {
+	// 	const blob = formDataFollowSpouse.leaveDocument.slice(0, formDataFollowSpouse.leaveDocument[0].size)
+	// 	const newFile = new File(blob, nameFile.value, {
+	// 		type: formDataFollowSpouse.leaveDocument[0].type,
+	// 	})
+	// 	formData.append("leaveDocument", newFile)
+	// } //
+	formData.append("leaveDocument", formDataFollowSpouse.leaveDocument)
 	formData.append("type", formDataFollowSpouse.type) //
 	formData.append("leaveStartDate", dateToISO(formDataFollowSpouse.leaveStartDate)) //
 	formData.append("leaveEndDate", dateToISO(formDataFollowSpouse.leaveEndDate)) //
@@ -450,7 +451,7 @@ function updateLeaveTotal() {
 							:rules="[val => !!val || `${'กรุณาเลือกตั้งแต่วันที่'}`]"
 						>
 							<template v-slot:prepend>
-								<q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)"> </q-icon>
+								<q-icon name="event" class="cursor-pointer" style="color: var(--black)"> </q-icon>
 							</template>
 						</q-input>
 					</template>
@@ -488,7 +489,7 @@ function updateLeaveTotal() {
 							:rules="[val => !!val || `${'กรุณาเลือกถึงวันที่'}`]"
 						>
 							<template v-slot:prepend>
-								<q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)"> </q-icon>
+								<q-icon name="event" class="cursor-pointer" style="color: var(--black)"> </q-icon>
 							</template>
 						</q-input>
 					</template>
diff --git a/src/modules/05_leave/components/Forms/13_RehabilitationForm.vue b/src/modules/05_leave/components/Forms/13_RehabilitationForm.vue
index 0e52e07..1c91e5c 100644
--- a/src/modules/05_leave/components/Forms/13_RehabilitationForm.vue
+++ b/src/modules/05_leave/components/Forms/13_RehabilitationForm.vue
@@ -120,21 +120,23 @@ async function FetchCheck() {
  */
 async function saveFormData() {
 	const formData = new FormData()
-	if (formDataRehabilitation.leaveDraftDocument.length > 0) {
-		const blobDrafe = formDataRehabilitation.leaveDraftDocument.slice(0, formDataRehabilitation.leaveDraftDocument[0].size)
-		const newFileDraft = new File(blobDrafe, nameFileDraft.value, {
-			type: formDataRehabilitation.leaveDraftDocument[0].type,
-		})
-		formData.append("leaveDraftDocument", newFileDraft) //
-	}
+	// if (formDataRehabilitation.leaveDraftDocument.length > 0) {
+	// 	const blobDrafe = formDataRehabilitation.leaveDraftDocument.slice(0, formDataRehabilitation.leaveDraftDocument[0].size)
+	// 	const newFileDraft = new File(blobDrafe, nameFileDraft.value, {
+	// 		type: formDataRehabilitation.leaveDraftDocument[0].type,
+	// 	})
+	// 	formData.append("leaveDraftDocument", newFileDraft) //
+	// }
 
-	if (formDataRehabilitation.leaveDocument.length > 0) {
-		const blob = formDataRehabilitation.leaveDocument.slice(0, formDataRehabilitation.leaveDocument[0].size)
-		const newFile = new File(blob, nameFile.value, {
-			type: formDataRehabilitation.leaveDocument[0].type,
-		})
-		formData.append("leaveDocument", newFile)
-	} //
+	// if (formDataRehabilitation.leaveDocument.length > 0) {
+	// 	const blob = formDataRehabilitation.leaveDocument.slice(0, formDataRehabilitation.leaveDocument[0].size)
+	// 	const newFile = new File(blob, nameFile.value, {
+	// 		type: formDataRehabilitation.leaveDocument[0].type,
+	// 	})
+	// 	formData.append("leaveDocument", newFile)
+	// } //
+	formData.append("leaveDraftDocument", formDataRehabilitation.leaveDraftDocument)
+	formData.append("leaveDocument", formDataRehabilitation.leaveDocument)
 	formData.append("type", formDataRehabilitation.type) //
 	formData.append("leaveStartDate", dateToISO(formDataRehabilitation.leaveStartDate)) //
 	formData.append("leaveEndDate", dateToISO(formDataRehabilitation.leaveEndDate)) //
diff --git a/src/modules/05_leave/components/Forms/Form.vue b/src/modules/05_leave/components/Forms/Form.vue
index 2c5cdfa..5c3eb54 100644
--- a/src/modules/05_leave/components/Forms/Form.vue
+++ b/src/modules/05_leave/components/Forms/Form.vue
@@ -65,7 +65,7 @@ onMounted(async () => {
 						:rules="[val => !!val || `${'กรุณาเลือกวันที่ยื่นใบลา'}`]"
 					>
 						<template v-slot:prepend>
-							<q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)"> </q-icon>
+							<q-icon name="event" class="cursor-pointer" style="color: var(--black)"> </q-icon>
 						</template>
 					</q-input>
 				</template>