diff --git a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue index 9cf589651..0cbfbb355 100644 --- a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue +++ b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue @@ -690,11 +690,9 @@ onMounted(async () => { @click=" onClickDownloadFile( formData.id, - checkForm !== 'FormUpasom' && checkForm !== 'FormHajj' - ? formData.leaveTypeName - : formData.hajjDayStatus - ? 'ลาประกอบพิธีฮัจญ์' - : 'ลาอุปสมบท', + formData.leaveSubTypeName + ? formData.leaveSubTypeName + : formData.leaveTypeName, typeDocx ) " @@ -710,11 +708,9 @@ onMounted(async () => { @click=" onClickDownloadFile( formData.id, - checkForm !== 'FormUpasom' && checkForm !== 'FormHajj' - ? formData.leaveTypeName - : formData.hajjDayStatus - ? 'ลาประกอบพิธีฮัจญ์' - : 'ลาอุปสมบท', + formData.leaveSubTypeName + ? formData.leaveSubTypeName + : formData.leaveTypeName, typePdf ) " diff --git a/src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue b/src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue index 5bc690811..433a39f6d 100644 --- a/src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue +++ b/src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue @@ -504,7 +504,9 @@ onMounted(async () => { @click=" onClickDownloadFile( formData.id, - 'ยกเลิก' + formData.leaveTypeName, + 'ยกเลิก' + formData.leaveSubTypeName + ? formData.leaveSubTypeName + : formData.leaveTypeName, typeDocx ) " @@ -520,7 +522,9 @@ onMounted(async () => { @click=" onClickDownloadFile( formData.id, - 'ยกเลิก' + formData.leaveTypeName, + 'ยกเลิก' + formData.leaveSubTypeName + ? formData.leaveSubTypeName + : formData.leaveTypeName, typePdf ) "