diff --git a/src/modules/05_leave/componenst/Forms/01_SickForm.vue b/src/modules/05_leave/componenst/Forms/01_SickForm.vue
index 37a530d..acc39dc 100644
--- a/src/modules/05_leave/componenst/Forms/01_SickForm.vue
+++ b/src/modules/05_leave/componenst/Forms/01_SickForm.vue
@@ -43,9 +43,6 @@ const formDataSick = reactive<any>({
 	leaveDocument: [],
 })
 
-//แปลง leaveLast ด้วย Date2thai
-const leave2Thai = dataStore.leaveLast != null ? date2Thai(dataStore.leaveLast) : null
-
 /** ตัวแปร ref สำหรับแสดง validate */
 const leaveWroteRef = ref<object | null>(null)
 const leaveStartDateRef = ref<object | null>(null)
@@ -56,7 +53,6 @@ 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 leaveDocumentRef = ref<object | null>(null)
 
 /** maping ref เข้าตัวแปรเพื่อเตรียมตรวจสอบ */
 const FormRef: FormRef = {
@@ -68,7 +64,6 @@ const FormRef: FormRef = {
 	leaveNumber: leaveNumberRef,
 	leaveAddress: leaveAddressRef,
 	leaveDetail: leaveDetailRef,
-	leaveDocument: leaveDocumentRef,
 }
 
 /** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาที่ฟอร์มไหม เมื่อมีการส่งจะ map ข้อมูลเข้า v-model ของฟอร์ม */
@@ -138,11 +133,13 @@ const onSubmit = async () => {
  */
 async function saveFormData() {
 	const formData = new FormData()
-	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)
+	if (formDataSick.leaveDocument.length > 0) {
+		const blob = formDataSick.leaveDocument[0].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))
@@ -277,7 +274,7 @@ const isReadOnly = computed(() => {
 							week-start="0"
 							:readonly="isReadOnly"
 							@update:model-value="FetchCheck()"
-							:min-date="formDataSick.leaveStartDate ? new Date(formDataSick.leaveStartDate.getTime() + 24 * 60 * 60 * 1000) : null"
+							:min-date="formDataSick.leaveStartDate ? new Date(formDataSick.leaveStartDate.getTime() * 60 * 60 * 1000) : null"
 						>
 							<template #year="{ year }">
 								{{ year + 543 }}
@@ -323,7 +320,7 @@ const isReadOnly = computed(() => {
 							outlined
 							ref="leaveLastRef"
 							for="leaveLastRef"
-							v-model="leave2Thai"
+							v-model="dataStore.leaveLast"
 							label="ลาครั้งสุดท้ายเมื่อวันที่"
 							readonly
 							hide-bottom-space
@@ -379,7 +376,6 @@ const isReadOnly = computed(() => {
 				<div class="full-width">
 					<div class="q-col-gutter-sm row">
 						<q-file
-							ref="leaveDocumentRef"
 							for="leaveDocumentRef"
 							v-model="formDataSick.leaveDocument"
 							@added="fileUploadDoc"
@@ -390,7 +386,6 @@ const isReadOnly = computed(() => {
 							multiple
 							bg-color="white"
 							class="col-12 q-pl-sm col-12"
-							:rules="[val => !!val || `${'กรุณาเลือกไฟล์'}`]"
 						>
 							<template v-slot:prepend>
 								<q-icon name="attach_file" color="primary" />
diff --git a/src/modules/05_leave/componenst/Forms/03_Birth.vue b/src/modules/05_leave/componenst/Forms/03_Birth.vue
index 1d5d330..7573487 100644
--- a/src/modules/05_leave/componenst/Forms/03_Birth.vue
+++ b/src/modules/05_leave/componenst/Forms/03_Birth.vue
@@ -42,9 +42,6 @@ const formDataBirth = reactive<any>({
 	leaveDocument: [],
 })
 
-//แปลง leaveLast ด้วย Date2thai
-const leave2Thai = dataStore.leaveLast != null ? date2Thai(dataStore.leaveLast) : null
-
 /** ตัวแปร ref สำหรับแสดง validate */
 const leaveWroteRef = ref<object | null>(null)
 const leaveStartDateRef = ref<object | null>(null)
@@ -145,11 +142,13 @@ async function FetchCheck() {
  */
 async function saveFormData() {
 	const formData = new FormData()
-	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[0].slice(0, formDataBirth.leaveDocument[0].size)
+		const newFile = new File(blob, nameFile.value, {
+			type: formDataBirth.leaveDocument[0].type,
+		})
+		formData.append("leaveDocument", newFile)
+	}
 	formData.append("type", formDataBirth.type)
 	formData.append("leaveStartDate", dateToISO(formDataBirth.leaveStartDate))
 	formData.append("leaveEndDate", dateToISO(formDataBirth.leaveEndDate))
@@ -244,7 +243,7 @@ async function saveFormData() {
 					:enableTimePicker="false"
 					week-start="0"
 					:readonly="!formDataBirth.leaveStartDate"
-					:min-date="formDataBirth.leaveStartDate ? new Date(formDataBirth.leaveStartDate.getTime() + 24 * 60 * 60 * 1000) : null"
+					:min-date="formDataBirth.leaveStartDate ? new Date(formDataBirth.leaveStartDate.getTime() * 60 * 60 * 1000) : null"
 				>
 					<template #year="{ year }">
 						{{ year + 543 }}
@@ -290,7 +289,7 @@ async function saveFormData() {
 					outlined
 					ref="leaveLastRef"
 					for="leaveLastRef"
-					v-model="leave2Thai"
+					v-model="dataStore.leaveLast"
 					label="ลาครั้งสุดท้ายเมื่อวันที่"
 					readonly
 					hide-bottom-space
@@ -343,7 +342,6 @@ async function saveFormData() {
 				/>
 
 				<q-file
-					ref="leaveDocumentRef"
 					for="leaveDocumentRef"
 					hide-bottom-space
 					v-model="formDataBirth.leaveDocument"
@@ -355,7 +353,6 @@ async function saveFormData() {
 					use-chips
 					multiple
 					class="q-pl-sm col-12"
-					:rules="[val => !!val || `${'กรุณาเลือกไฟล์'}`]"
 				>
 					<template v-slot:prepend>
 						<q-icon name="attach_file" color="primary" />
diff --git a/src/modules/05_leave/componenst/Forms/04_HelpWifeBirthForm.vue b/src/modules/05_leave/componenst/Forms/04_HelpWifeBirthForm.vue
index a5bf61d..1fd3f5b 100644
--- a/src/modules/05_leave/componenst/Forms/04_HelpWifeBirthForm.vue
+++ b/src/modules/05_leave/componenst/Forms/04_HelpWifeBirthForm.vue
@@ -158,12 +158,13 @@ async function FetchCheck() {
  */
 async function saveFormData() {
 	const formData = new FormData()
-
-	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[0].slice(0, formDataHelpWife.leaveDocument[0].size)
+		const newFile = new File(blob, nameFile.value, {
+			type: formDataHelpWife.leaveDocument[0].type,
+		})
+		formData.append("leaveDocument", newFile)
+	}
 	formData.append("type", formDataHelpWife.type)
 	formData.append("leaveStartDate", dateToISO(formDataHelpWife.leaveStartDate))
 	formData.append("leaveEndDate", dateToISO(formDataHelpWife.leaveEndDate))
@@ -257,7 +258,7 @@ async function saveFormData() {
 					@update:model-value="updateLeaveTotal, FetchCheck()"
 					week-start="0"
 					:readonly="!formDataHelpWife.leaveStartDate"
-					:min-date="formDataHelpWife.leaveStartDate ? new Date(formDataHelpWife.leaveStartDate.getTime() + 24 * 60 * 60 * 1000) : null"
+					:min-date="formDataHelpWife.leaveStartDate ? new Date(formDataHelpWife.leaveStartDate.getTime() * 60 * 60 * 1000) : null"
 				>
 					<template #year="{ year }">
 						{{ year + 543 }}
diff --git a/src/modules/05_leave/componenst/Forms/05_VacationForm.vue b/src/modules/05_leave/componenst/Forms/05_VacationForm.vue
index a958969..cd8c577 100644
--- a/src/modules/05_leave/componenst/Forms/05_VacationForm.vue
+++ b/src/modules/05_leave/componenst/Forms/05_VacationForm.vue
@@ -154,12 +154,13 @@ async function FetchCheck() {
  */
 async function saveFormData() {
 	const formData = new FormData()
-
-	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[0].slice(0, formDataVacation.leaveDocument[0].size)
+		const newFile = new File(blob, nameFile.value, {
+			type: formDataVacation.leaveDocument[0].type,
+		})
+		formData.append("leaveDocument", newFile)
+	}
 	formData.append("type", formDataVacation.type)
 	formData.append("leaveStartDate", dateToISO(formDataVacation.leaveStartDate))
 	formData.append("leaveEndDate", dateToISO(formDataVacation.leaveEndDate))
@@ -250,7 +251,7 @@ const isReadOnly = computed(() => {
 					hide-bottom-space
 					bg-color="white"
 					outlined
-					v-model="dataStore.restDayCurrentTotal"
+					v-model="dataStore.leaveRemain"
 					label="จำนวนวันลาพักผ่อนประจำปีปัจจุบัน"
 				/>
 
@@ -305,7 +306,7 @@ const isReadOnly = computed(() => {
 					:enableTimePicker="false"
 					week-start="0"
 					:readonly="isReadOnly"
-					:min-date="formDataVacation.leaveStartDate ? new Date(formDataVacation.leaveStartDate.getTime() + 24 * 60 * 60 * 1000) : null"
+					:min-date="formDataVacation.leaveStartDate ? new Date(formDataVacation.leaveStartDate.getTime() * 60 * 60 * 1000) : null"
 				>
 					<template #year="{ year }">
 						{{ year + 543 }}
diff --git a/src/modules/05_leave/componenst/Forms/06_OrdinationForm.vue b/src/modules/05_leave/componenst/Forms/06_OrdinationForm.vue
index 63fca2d..9bca382 100644
--- a/src/modules/05_leave/componenst/Forms/06_OrdinationForm.vue
+++ b/src/modules/05_leave/componenst/Forms/06_OrdinationForm.vue
@@ -157,12 +157,13 @@ async function FetchCheck() {
  */
 async function saveFormData() {
 	const formData = new FormData()
-
-	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[0].slice(0, formDataOrdination.leaveDocument[0].size)
+		const newFile = new File(blob, nameFile.value, {
+			type: formDataOrdination.leaveDocument[0].type,
+		})
+		formData.append("leaveDocument", newFile)
+	}
 	formData.append("type", formDataOrdination.type)
 	formData.append("leaveStartDate", dateToISO(formDataOrdination.leaveStartDate))
 	formData.append("leaveEndDate", dateToISO(formDataOrdination.leaveEndDate))
@@ -263,7 +264,7 @@ function updateLeaveTotal() {
 					@update:model-value="updateLeaveTotal, FetchCheck()"
 					:readonly="!formDataOrdination.leaveStartDate"
 					:enableTimePicker="false"
-					:min-date="formDataOrdination.leaveStartDate ? new Date(formDataOrdination.leaveStartDate.getTime() + 24 * 60 * 60 * 1000) : null"
+					:min-date="formDataOrdination.leaveStartDate ? new Date(formDataOrdination.leaveStartDate.getTime() * 60 * 60 * 1000) : null"
 					week-start="0"
 				>
 					<template #year="{ year }">
diff --git a/src/modules/05_leave/componenst/Forms/07_HajjForm.vue b/src/modules/05_leave/componenst/Forms/07_HajjForm.vue
index b52ca1a..ea42974 100644
--- a/src/modules/05_leave/componenst/Forms/07_HajjForm.vue
+++ b/src/modules/05_leave/componenst/Forms/07_HajjForm.vue
@@ -123,12 +123,13 @@ async function FetchCheck() {
  */
 async function saveFormData() {
 	const formData = new FormData()
-
-	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[0].slice(0, formDataHaji.leaveDocument[0].size)
+		const newFile = new File(blob, nameFile.value, {
+			type: formDataHaji.leaveDocument[0].type,
+		})
+		formData.append("leaveDocument", newFile)
+	}
 	formData.append("type", formDataHaji.type)
 	formData.append("leaveStartDate", dateToISO(formDataHaji.leaveStartDate))
 	formData.append("leaveEndDate", dateToISO(formDataHaji.leaveEndDate))
@@ -226,7 +227,7 @@ function updateLeaveTotal() {
 							:locale="'th'"
 							@update:model-value="updateLeaveTotal"
 							:readonly="!formDataHaji.leaveStartDate"
-							:min-date="formDataHaji.leaveStartDate ? new Date(formDataHaji.leaveStartDate.getTime() + 24 * 60 * 60 * 1000) : null"
+							:min-date="formDataHaji.leaveStartDate ? new Date(formDataHaji.leaveStartDate.getTime() * 60 * 60 * 1000) : null"
 						>
 							<template #year="{ year }">
 								{{ year + 543 }}
diff --git a/src/modules/05_leave/componenst/Forms/08_MilitaryForm.vue b/src/modules/05_leave/componenst/Forms/08_MilitaryForm.vue
index fd96c01..259720a 100644
--- a/src/modules/05_leave/componenst/Forms/08_MilitaryForm.vue
+++ b/src/modules/05_leave/componenst/Forms/08_MilitaryForm.vue
@@ -135,11 +135,13 @@ async function FetchCheck() {
  */
 async function saveFormData() {
 	const formData = new FormData()
-	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[0].slice(0, formDataMilitary.leaveDocument[0].size)
+		const newFile = new File(blob, nameFile.value, {
+			type: formDataMilitary.leaveDocument[0].type,
+		})
+		formData.append("leaveDocument", newFile)
+	}
 	formData.append("type", formDataMilitary.type)
 	formData.append("leaveStartDate", dateToISO(formDataMilitary.leaveStartDate))
 	formData.append("leaveEndDate", dateToISO(formDataMilitary.leaveEndDate))
@@ -238,7 +240,7 @@ function updateLeaveTotal() {
 					week-start="0"
 					@update:model-value="updateLeaveTotal, FetchCheck()"
 					:readonly="!formDataMilitary.leaveStartDate"
-					:min-date="formDataMilitary.leaveStartDate ? new Date(formDataMilitary.leaveStartDate.getTime() + 24 * 60 * 60 * 1000) : null"
+					:min-date="formDataMilitary.leaveStartDate ? new Date(formDataMilitary.leaveStartDate.getTime() * 60 * 60 * 1000) : null"
 				>
 					<template #year="{ year }">
 						{{ year + 543 }}
diff --git a/src/modules/05_leave/componenst/Forms/09_StudyForm.vue b/src/modules/05_leave/componenst/Forms/09_StudyForm.vue
index ca39791..97ce271 100644
--- a/src/modules/05_leave/componenst/Forms/09_StudyForm.vue
+++ b/src/modules/05_leave/componenst/Forms/09_StudyForm.vue
@@ -145,11 +145,13 @@ async function FetchCheck() {
 }
 async function saveFormData() {
 	const formData = new FormData()
-	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[0].slice(0, formDataStudy.leaveDocument[0].size)
+		const newFile = new File(blob, nameFile.value, {
+			type: formDataStudy.leaveDocument[0].type,
+		})
+		formData.append("leaveDocument", newFile)
+	}
 	formData.append("type", formDataStudy.type) //
 	formData.append("leaveStartDate", dateToISO(formDataStudy.leaveStartDate)) //
 	formData.append("leaveEndDate", dateToISO(formDataStudy.leaveEndDate)) //
@@ -260,7 +262,7 @@ const formattedleaveSalary = computed(() => {
 					@update:model-value="updateLeaveTotal, FetchCheck()"
 					:readonly="!formDataStudy.leaveStartDate"
 					:enableTimePicker="false"
-					:min-date="formDataStudy.leaveStartDate ? new Date(formDataStudy.leaveStartDate.getTime() + 24 * 60 * 60 * 1000) : null"
+					:min-date="formDataStudy.leaveStartDate ? new Date(formDataStudy.leaveStartDate.getTime() * 60 * 60 * 1000) : null"
 				>
 					<template #year="{ year }">
 						{{ year + 543 }}
diff --git a/src/modules/05_leave/componenst/Forms/10_TrainForm.vue b/src/modules/05_leave/componenst/Forms/10_TrainForm.vue
index 854f279..8922b1d 100644
--- a/src/modules/05_leave/componenst/Forms/10_TrainForm.vue
+++ b/src/modules/05_leave/componenst/Forms/10_TrainForm.vue
@@ -144,11 +144,13 @@ async function FetchCheck() {
  */
 async function saveFormData() {
 	const formData = new FormData()
-	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[0].slice(0, formDataTrain.leaveDocument[0].size)
+		const newFile = new File(blob, nameFile.value, {
+			type: formDataTrain.leaveDocument[0].type,
+		})
+		formData.append("leaveDocument", newFile)
+	} //
 	formData.append("type", formDataTrain.type) //
 	formData.append("leaveStartDate", dateToISO(formDataTrain.leaveStartDate)) //
 	formData.append("leaveEndDate", dateToISO(formDataTrain.leaveEndDate)) //
@@ -261,7 +263,7 @@ const formattedSalary = computed(() => {
 					:readonly="!formDataTrain.leaveStartDate"
 					:locale="'th'"
 					:enableTimePicker="false"
-					:min-date="formDataTrain.leaveStartDate ? new Date(formDataTrain.leaveStartDate.getTime() + 24 * 60 * 60 * 1000) : null"
+					:min-date="formDataTrain.leaveStartDate ? new Date(formDataTrain.leaveStartDate.getTime() * 60 * 60 * 1000) : null"
 				>
 					<template #year="{ year }">
 						{{ year + 543 }}
diff --git a/src/modules/05_leave/componenst/Forms/11_WorkInternationalForm.vue b/src/modules/05_leave/componenst/Forms/11_WorkInternationalForm.vue
index ee784a7..6b5c8f2 100644
--- a/src/modules/05_leave/componenst/Forms/11_WorkInternationalForm.vue
+++ b/src/modules/05_leave/componenst/Forms/11_WorkInternationalForm.vue
@@ -138,17 +138,22 @@ async function FetchCheck() {
  */
 async function saveFormData() {
 	const formData = new FormData()
-	const blob = formDataWorkInternational.leaveDocument.slice(0, formDataWorkInternational.leaveDocument[0].size)
-	const newFile = new File(blob, nameFile.value, {
-		type: formDataWorkInternational.leaveDocument[0].type,
-	})
-	const blobDrafe = formDataWorkInternational.leaveDraftDocument.slice(0, formDataWorkInternational.leaveDraftDocument[0].size)
-	const newFileDraft = new File(blobDrafe, nameFileDraft.value, {
-		type: formDataWorkInternational.leaveDraftDocument[0].type,
-	})
-
-	formData.append("leaveDocument", newFile) //
-	formData.append("leaveDraftDocument", newFileDraft) //
+	//
+	if (formDataWorkInternational.leaveDocument.length > 0) {
+		const blob = formDataWorkInternational.leaveDocument[0].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("type", formDataWorkInternational.type) //
 	formData.append("leaveStartDate", dateToISO(formDataWorkInternational.leaveStartDate)) //
 	formData.append("leaveEndDate", dateToISO(formDataWorkInternational.leaveEndDate)) //
@@ -240,7 +245,7 @@ async function saveFormData() {
 					@update:model-value="FetchCheck()"
 					week-start="0"
 					:readonly="!formDataWorkInternational.leaveStartDate"
-					:min-date="formDataWorkInternational.leaveStartDate ? new Date(formDataWorkInternational.leaveStartDate.getTime() + 24 * 60 * 60 * 1000) : null"
+					:min-date="formDataWorkInternational.leaveStartDate ? new Date(formDataWorkInternational.leaveStartDate.getTime() * 60 * 60 * 1000) : null"
 				>
 					<template #year="{ year }">
 						{{ year + 543 }}
diff --git a/src/modules/05_leave/componenst/Forms/12_FollowSpouseForm.vue b/src/modules/05_leave/componenst/Forms/12_FollowSpouseForm.vue
index 809545a..ad9d34b 100644
--- a/src/modules/05_leave/componenst/Forms/12_FollowSpouseForm.vue
+++ b/src/modules/05_leave/componenst/Forms/12_FollowSpouseForm.vue
@@ -170,12 +170,13 @@ async function FetchCheck() {
  */
 async function saveFormData() {
 	const formData = new FormData()
-	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[0].slice(0, formDataFollowSpouse.leaveDocument[0].size)
+		const newFile = new File(blob, nameFile.value, {
+			type: formDataFollowSpouse.leaveDocument[0].type,
+		})
+		formData.append("leaveDocument", newFile)
+	} //
 	formData.append("type", formDataFollowSpouse.type) //
 	formData.append("leaveStartDate", dateToISO(formDataFollowSpouse.leaveStartDate)) //
 	formData.append("leaveEndDate", dateToISO(formDataFollowSpouse.leaveEndDate)) //
@@ -286,7 +287,7 @@ function updateLeaveTotal() {
 					week-start="0"
 					@update:model-value="updateLeaveTotal, FetchCheck()"
 					:readonly="!formDataFollowSpouse.leaveStartDate"
-					:min-date="formDataFollowSpouse.leaveStartDate ? new Date(formDataFollowSpouse.leaveStartDate.getTime() + 24 * 60 * 60 * 1000) : null"
+					:min-date="formDataFollowSpouse.leaveStartDate ? new Date(formDataFollowSpouse.leaveStartDate.getTime() * 60 * 60 * 1000) : null"
 				>
 					<template #year="{ year }">
 						{{ year + 543 }}
diff --git a/src/modules/05_leave/componenst/Forms/13_RehabilitationForm.vue b/src/modules/05_leave/componenst/Forms/13_RehabilitationForm.vue
index 0941569..eb44534 100644
--- a/src/modules/05_leave/componenst/Forms/13_RehabilitationForm.vue
+++ b/src/modules/05_leave/componenst/Forms/13_RehabilitationForm.vue
@@ -120,17 +120,21 @@ async function FetchCheck() {
  */
 async function saveFormData() {
 	const formData = new FormData()
-	const blob = formDataRehabilitation.leaveDocument.slice(0, formDataRehabilitation.leaveDocument[0].size)
-	const newFile = new File(blob, nameFile.value, {
-		type: formDataRehabilitation.leaveDocument[0].type,
-	})
-	const blobDrafe = formDataRehabilitation.leaveDraftDocument.slice(0, formDataRehabilitation.leaveDraftDocument[0].size)
-	const newFileDraft = new File(blobDrafe, nameFileDraft.value, {
-		type: formDataRehabilitation.leaveDraftDocument[0].type,
-	})
+	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) //
+	}
 
-	formData.append("leaveDocument", newFile) //
-	formData.append("leaveDraftDocument", newFileDraft) //
+	if (formDataRehabilitation.leaveDocument.length > 0) {
+		const blob = formDataRehabilitation.leaveDocument[0].slice(0, formDataRehabilitation.leaveDocument[0].size)
+		const newFile = new File(blob, nameFile.value, {
+			type: formDataRehabilitation.leaveDocument[0].type,
+		})
+		formData.append("leaveDocument", newFile)
+	} //
 	formData.append("type", formDataRehabilitation.type) //
 	formData.append("leaveStartDate", dateToISO(formDataRehabilitation.leaveStartDate)) //
 	formData.append("leaveEndDate", dateToISO(formDataRehabilitation.leaveEndDate)) //
@@ -217,7 +221,7 @@ async function saveFormData() {
 					@update:model-value="FetchCheck()"
 					:readonly="!formDataRehabilitation.leaveStartDate"
 					:enableTimePicker="false"
-					:min-date="formDataRehabilitation.leaveStartDate ? new Date(formDataRehabilitation.leaveStartDate.getTime() + 24 * 60 * 60 * 1000) : null"
+					:min-date="formDataRehabilitation.leaveStartDate ? new Date(formDataRehabilitation.leaveStartDate.getTime() * 60 * 60 * 1000) : null"
 				>
 					<template #year="{ year }">
 						{{ year + 543 }}
diff --git a/src/modules/05_leave/interface/request/SickForm.ts b/src/modules/05_leave/interface/request/SickForm.ts
index 9701480..e3573be 100644
--- a/src/modules/05_leave/interface/request/SickForm.ts
+++ b/src/modules/05_leave/interface/request/SickForm.ts
@@ -21,7 +21,7 @@ interface FormRef {
 	leaveNumber: object | null //หมายเลขที่ติดต่อขณะลา
 	leaveDetail: object | null //รายละเอียดการลา
 	leaveAddress: object | null //สถานที่ติดต่อขณะลา
-	leaveDocument: object | null //เอกสารปะกอบ
+
 	[key: string]: any
 }
 
diff --git a/src/modules/05_leave/store.ts b/src/modules/05_leave/store.ts
index 098c7b7..ce8c97a 100644
--- a/src/modules/05_leave/store.ts
+++ b/src/modules/05_leave/store.ts
@@ -240,12 +240,10 @@ export const useLeaveStore = defineStore("Leave", () => {
 	const dateAppoint = ref<Date>() //วันที่เข้ารับราชการ
 	const salary = ref<number>(0) //เงินเดือนปัจจุบัน
 	const salaryText = ref<string>("") //เงินเดือนปัจจุบัน(ภาษาไทย)
-	const leaveLast = ref<Date>()
+	const leaveLast = ref<any>()
 	const restDayCurrentTotal = ref<string>("")
-
 	//ดึงข้อมูล profile จาก API
 	async function fetchProfile() {
-		console.log("profile")
 		await http
 			.post(config.API.leaveProfile(), { type: typeId.value })
 			.then((res: any) => {
@@ -265,9 +263,8 @@ export const useLeaveStore = defineStore("Leave", () => {
 				dateAppoint.value = data.dateAppoint
 				salary.value = data.salary
 				salaryText.value = data.salaryText
-				leaveLast.value = data.leaveLast && date2Thai(data.leaveLast)
+				leaveLast.value = date2Thai(data.leaveLast) !== "0001-01-01T00:00:00" ? date2Thai(data.leaveLast) : "-"
 				restDayCurrentTotal.value = data.restDayCurrentTotal
-				console.log(data)
 			})
 			.catch((e: any) => {
 				messageError($q, e)
diff --git a/src/modules/05_leave/views/AddPage.vue b/src/modules/05_leave/views/AddPage.vue
index 79c53d7..90a65f8 100644
--- a/src/modules/05_leave/views/AddPage.vue
+++ b/src/modules/05_leave/views/AddPage.vue
@@ -52,23 +52,6 @@ async function fectOptionType() {
 			messageError($q, err)
 		})
 }
-/**
- * check ว่าลาได้ไหม จาก api
- * @param formData
- */
-async function FetchCheck(formData: any) {
-	await http
-		.post(config.API.leaveCheck(), { type: dataStore.typeId ?? null, leaveStartDate: formData.leaveStartDate ?? null, leaveEndDate: formData.leaveEndDate ?? null })
-		.then((res: any) => {
-			const data = res.data.result
-			formData.dateStart = data.isLeave
-			formData.subject = data.sumDateWork
-			formData.leaveabsentDaySummon = data.totalDate
-		})
-		.catch((e: any) => {
-			messageError($q, e)
-		})
-}
 </script>
 
 <template>