diff --git a/src/modules/09_leave/components/2_Leave/DetailLeave.vue b/src/modules/09_leave/components/2_Leave/DetailLeave.vue index 8b50dce31..60fc4d4e8 100644 --- a/src/modules/09_leave/components/2_Leave/DetailLeave.vue +++ b/src/modules/09_leave/components/2_Leave/DetailLeave.vue @@ -133,6 +133,7 @@ const formData = reactive({ coupleDaySumTotalHistory: "", //ประวัติ ในกรณีลาติดต่อกับครั้งก่อน รวมทั้งนี้ด้วย เป็นเวลา กี่ปี กี่เดือน กี่วัน (ลาติดตามคู่สมรส) approveStep: "", dear: "", + leaveRange: "", }); onMounted(async () => { @@ -181,6 +182,7 @@ async function fetchDetailLeave(paramsId: string) { formData.leaveWrote = data.leaveWrote ? data.leaveWrote : "-"; formData.leaveAddress = data.leaveAddress ? data.leaveAddress : "-"; formData.leaveNumber = data.leaveNumber ? data.leaveNumber : "-"; + formData.leaveRange = data.leaveRange; formData.leaveDetail = data.leaveDetail ? data.leaveDetail : "-"; formData.leaveDocument = data.leaveDocument; formData.leaveDraftDocument = data.leaveDraftDocument; diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formLeave.vue b/src/modules/09_leave/components/2_Leave/formDetail/formLeave.vue index 0c845d0e0..93fdba36f 100644 --- a/src/modules/09_leave/components/2_Leave/formDetail/formLeave.vue +++ b/src/modules/09_leave/components/2_Leave/formDetail/formLeave.vue @@ -24,7 +24,15 @@ const props = defineProps({
จำนวนวันที่ลา
-
{{ props.data.leaveTotal }}
+
+ {{ + props.data.leaveRange == "ALL" + ? props.data.leaveTotal + " วัน" + : props.data.leaveRange == "MORNING" + ? "ลาครึ่งวันเช้า (0.5)" + : "ลาครึ่งวันบ่าย (0.5)" + }} +
diff --git a/src/modules/09_leave/interface/request/leave.ts b/src/modules/09_leave/interface/request/leave.ts index 9a91d300d..5b4b2fdc1 100644 --- a/src/modules/09_leave/interface/request/leave.ts +++ b/src/modules/09_leave/interface/request/leave.ts @@ -89,6 +89,7 @@ interface FremData { coupleDaySumTotalHistory: string; //ประวัติ ในกรณีลาติดต่อกับครั้งก่อน รวมทั้งนี้ด้วย เป็นเวลา กี่ปี กี่เดือน กี่วัน (ลาติดตามคู่สมรส) approveStep: string; dear: string; + leaveRange: string; } export type { ListsData, FremData, QuerySting, DateFilter }; diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step8.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step8.vue index 94211542b..73ea48e37 100644 --- a/src/modules/12_evaluatePersonal/components/Detail/step/step8.vue +++ b/src/modules/12_evaluatePersonal/components/Detail/step/step8.vue @@ -887,7 +887,7 @@ onMounted(async () => {
เอกสารเล่ม 2 (ฉบับแก้ไข)
-
+
{ * addFiles */ function uploadFile() { - fetchDataFile(); + // fetchDataFile(); if (file) { const fileList = [ { @@ -180,18 +181,42 @@ function uploadFile() { showLoader(); http .post(config.API.meetingFilebyId("การประชุม", id.value), requestBody) - .then((res) => {}) + .then((res) => { + const foundKey: string | undefined = Object.keys(res.data).find( + (key) => + res.data[key]?.fileName !== undefined && + res.data[key]?.fileName !== "" + ); + foundKey && uploadfileURL(res.data[foundKey]?.uploadUrl, file.value); + }) .catch((e) => { messageError($q, e); }) .finally(async () => { - hideLoader(); file.value = null; - setTimeout(() => fetchDataFile(), 500); + // hideLoader(); }); } } +async function uploadfileURL(uploadUrl: string, file: any) { + await axios + .put(uploadUrl, file, { + headers: { + "Content-Type": file.type, + }, + }) + .then(() => { + success($q, "อัปโหลไฟล์สำเร็จ"); + }) + .catch((err) => { + messageError($q, err); + }) + .finally(async () => { + await setTimeout(() => fetchDataFile(), 500); + }); +} + function deleteFile(id: string) { dialogRemove($q, () => confirmDelete(id)); }