diff --git a/src/api/leave/api.leave.ts b/src/api/leave/api.leave.ts
index 945614c..d1713bb 100644
--- a/src/api/leave/api.leave.ts
+++ b/src/api/leave/api.leave.ts
@@ -22,4 +22,5 @@ export default {
 	leaveUserId: (id: string) => `${leave}/user/${id}`,
 	leaveProfile: () => `${leave}/user/profile`,
 	leaveCheck: () => `${leave}/user/check`,
+	leaveReport: (id: string) => `${leave}/report/${id}`,
 }
diff --git a/src/modules/05_leave/components/Forms/01_SickForm.vue b/src/modules/05_leave/components/Forms/01_SickForm.vue
index a8b0f4f..8bef1bf 100644
--- a/src/modules/05_leave/components/Forms/01_SickForm.vue
+++ b/src/modules/05_leave/components/Forms/01_SickForm.vue
@@ -301,8 +301,8 @@ function resetEndDate(type: string) {
 							borderless
 							:enableTimePicker="false"
 							week-start="0"
-							:readonly="isReadOnly"
-							@update:model-value="FetchCheck()"
+							:readonly="!formDataSick.leaveStartDate"
+							@update:model-value="FetchCheck(), isReadOnly"
 							:min-date="formDataSick.leaveStartDate"
 						>
 							<template #year="{ year }">
@@ -319,7 +319,7 @@ function resetEndDate(type: string) {
 									for="leaveEndDateRef"
 									hide-bottom-space
 									bg-color="white"
-									:readonly="isReadOnly"
+									:readonly="!formDataSick.leaveStartDate"
 									:class="inputEdit(isReadOnly)"
 									:model-value="formDataSick.leaveEndDate != null ? date2Thai(formDataSick.leaveEndDate) : null"
 									:label="`${'ลาถึงวันที่'}`"
diff --git a/src/modules/05_leave/components/Forms/11_WorkInternationalForm.vue b/src/modules/05_leave/components/Forms/11_WorkInternationalForm.vue
index 9ad7a56..c3e1fbe 100644
--- a/src/modules/05_leave/components/Forms/11_WorkInternationalForm.vue
+++ b/src/modules/05_leave/components/Forms/11_WorkInternationalForm.vue
@@ -7,6 +7,7 @@ import { useLeaveStore } from "@/modules/05_leave/store"
 import http from "@/plugins/http"
 import config from "@/app.config"
 import { useRouter } from "vue-router"
+import genReport from "@/plugins/genreport"
 
 /** Use */
 const dataStore = useLeaveStore()
@@ -106,6 +107,24 @@ const onSubmit = async () => {
 	)
 }
 
+//download function
+async function onClickDownloadFile(id: string, fileName: string) {
+	// showLoader();
+	await http
+		.get(config.API.leaveReport(id))
+		.then(async res => {
+			console.log(res)
+			const data = res.data.result
+			await genReport(data, fileName)
+		})
+		.catch(err => {
+			messageError($q, err)
+		})
+		.finally(() => {
+			// hideLoader();
+		})
+}
+
 /**
  * check ว่าลาได้ไหม จาก api
  * @param formData
@@ -350,7 +369,7 @@ async function saveFormData() {
 					<div class="col-12 col-sm-4 col-md-4 q-my-sm offset-sm-1 offset-md-2">
 						<div class="column q-mx-xs">
 							<div class="q-pl-sm text-weight-bold text-dark text-center">ดาวน์โหลด</div>
-							<q-btn color="primary" icon="download" label="ดาวน์โหลดแบบฟอร์ม" />
+							<q-btn color="primary" icon="download" label="ดาวน์โหลดแบบฟอร์ม" @click="onClickDownloadFile(formDataWorkInternational.typeId, 'dataStore.typeId')" />
 						</div>
 					</div>
 					<div class="col-10 col-sm-5 col-md-4 q-my-sm">
diff --git a/src/modules/05_leave/components/Forms/13_RehabilitationForm.vue b/src/modules/05_leave/components/Forms/13_RehabilitationForm.vue
index 2aa681b..8194832 100644
--- a/src/modules/05_leave/components/Forms/13_RehabilitationForm.vue
+++ b/src/modules/05_leave/components/Forms/13_RehabilitationForm.vue
@@ -7,6 +7,7 @@ import { useLeaveStore } from "@/modules/05_leave/store"
 import http from "@/plugins/http"
 import config from "@/app.config"
 import { useRouter } from "vue-router"
+import genReport from "@/plugins/genreport"
 
 /** Use */
 const dataStore = useLeaveStore()
@@ -115,6 +116,24 @@ async function FetchCheck() {
 		})
 }
 
+//download function
+async function onClickDownloadFile(id: string, fileName: string) {
+	// showLoader();
+	await http
+		.get(config.API.leaveReport(id))
+		.then(async res => {
+			console.log(res)
+			const data = res.data.result
+			await genReport(data, fileName)
+		})
+		.catch(err => {
+			messageError($q, err)
+		})
+		.finally(() => {
+			// hideLoader();
+		})
+}
+
 /**
  * ฟังชั่นบันทีกข้อมูลจาก formdata ส่งไปที่ Api
  */
@@ -294,7 +313,7 @@ async function saveFormData() {
 					<div class="col-12 col-sm-4 col-md-4 q-my-sm offset-sm-1 offset-md-2">
 						<div class="column q-mx-xs">
 							<div class="q-pl-sm text-weight-bold text-dark text-center">ดาวน์โหลด</div>
-							<q-btn color="primary" icon="download" label="ดาวน์โหลดแบบฟอร์ม" />
+							<q-btn color="primary" icon="download" label="ดาวน์โหลดแบบฟอร์ม" @click="onClickDownloadFile(formDataRehabilitation.typeId, ' dataStore.typeId')" />
 						</div>
 					</div>
 					<div class="col-10 col-sm-5 col-md-4 q-my-sm">