From 171a438974f5bcc31d510dac317cdc6564242ed5 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Fri, 15 Nov 2024 11:49:43 +0700 Subject: [PATCH] =?UTF-8?q?workflow=20=3D>=20=E0=B8=A3=E0=B8=B0=E0=B8=9A?= =?UTF-8?q?=E0=B8=9A=E0=B8=A5=E0=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../09_leave/components/2_Leave/DetailLeave.vue | 15 +++++++++++++-- .../components/2_Leave/DetailLeaveReject.vue | 14 ++++++++++++-- src/modules/09_leave/interface/request/leave.ts | 1 + 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/modules/09_leave/components/2_Leave/DetailLeave.vue b/src/modules/09_leave/components/2_Leave/DetailLeave.vue index 6d7d0cc28..3b1ddf7a9 100644 --- a/src/modules/09_leave/components/2_Leave/DetailLeave.vue +++ b/src/modules/09_leave/components/2_Leave/DetailLeave.vue @@ -121,13 +121,17 @@ const formData = reactive({ approveStep: "", dear: "", leaveRange: "", + profileType: "", }); +const isLoadData = ref(false); + /** * Function fetch รายละเอียดของข้อมูล * @param paramsId รับ ID จาก paramID */ async function fetchDetailLeave(paramsId: string) { + isLoadData.value = false; showLoader(); await http .get(config.API.leaveListById(paramsId)) @@ -264,6 +268,9 @@ async function fetchDetailLeave(paramsId: string) { : "-"; formData.approveStep = data.approveStep ? data.approveStep : "-"; formData.dear = data.dear ? data.dear : "-"; + formData.profileType = data.profileType; + + isLoadData.value = true; /** ส่งประเภทของการลาไป Function เช็คประเภทการลา*/ await fectOptionType(); @@ -802,12 +809,16 @@ onMounted(async () => { -
+
diff --git a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue b/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue index 68adf2d30..aad0434ea 100644 --- a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue +++ b/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue @@ -147,8 +147,11 @@ const formData = reactive({ coupleDaySumTotalHistory: "", //ประวัติ ในกรณีลาติดต่อกับครั้งก่อน รวมทั้งนี้ด้วย เป็นเวลา กี่ปี กี่เดือน กี่วัน (ลาติดตามคู่สมรส) approveStep: "", dear: "", + profileType: "", }); +const isLoadData = ref(false); + onMounted(async () => { if (paramsId) { showLoader(); @@ -192,6 +195,7 @@ async function fetchDetailDeleteLeave(paramsId: string) { } async function fetchDetailLeave(paramsId: string) { + isLoadData.value = false; await http .get(config.API.leaveListById(paramsId)) .then(async (res) => { @@ -275,6 +279,8 @@ async function fetchDetailLeave(paramsId: string) { formData.coupleDaySumTotalHistory = data.coupleDaySumTotalHistory; formData.approveStep = data.approveStep; formData.dear = data.dear ? data.dear : "-"; + formData.profileType = data.profileType; + isLoadData.value = true; await fectOptionType(); }) .catch((err) => { @@ -708,11 +714,15 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) { -
+
diff --git a/src/modules/09_leave/interface/request/leave.ts b/src/modules/09_leave/interface/request/leave.ts index b59049338..78c464741 100644 --- a/src/modules/09_leave/interface/request/leave.ts +++ b/src/modules/09_leave/interface/request/leave.ts @@ -90,6 +90,7 @@ interface FremData { approveStep: string; dear: string; leaveRange?: string; + profileType: string; } export type { ListsData, FremData, QuerySting, DateFilter };