diff --git a/src/modules/05_leave/components/DialogDetail.vue b/src/modules/05_leave/components/DialogDetail.vue
index 7874515..3333374 100644
--- a/src/modules/05_leave/components/DialogDetail.vue
+++ b/src/modules/05_leave/components/DialogDetail.vue
@@ -6,7 +6,7 @@ import http from "@/plugins/http";
import config from "@/app.config";
import { useCounterMixin } from "@/stores/mixin";
import { useLeaveStore } from "@/modules/05_leave/store";
-import genReport from "@/plugins/genreport";
+import { useDataStore } from "@/stores/data";
/** import type*/
import type {
@@ -16,6 +16,8 @@ import type {
FromCancelDetail,
} from "@/modules/05_leave/interface/response/leave";
+import DialogHeader from "@/components/DialogHeader.vue";
+import Workflow from "@/components/Workflow/Main.vue";
import FormLeave from "@/modules/05_leave/components/formDetail/01_SickForm.vue";
import FormChildbirth from "@/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue";
import FormHoliday from "@/modules/05_leave/components/formDetail/05_VacationForm.vue";
@@ -31,6 +33,7 @@ import FormCancel from "@/modules/05_leave/components/formDetail/formCancel.vue"
const $q = useQuasar();
const dataStore = useLeaveStore();
+const mainStore = useDataStore();
const { convertStatud } = dataStore;
const mixin = useCounterMixin();
const {
@@ -408,28 +411,6 @@ async function onSubmit() {
});
}
-/**
- * ฟังก์ชันดาวน์โหลดไฟล์
- * @param id รหัสการลา
- * @param fileName ชื่อไฟล์
- * @param type ประเภทไฟล์
- */
-async function onClickDownloadFile(id: string, fileName: string, type: string) {
- showLoader();
- await http
- .get(config.API.leaveReport(id))
- .then(async (res) => {
- const data = res.data.result;
- await genReport(data, fileName, type);
- })
- .catch((err) => {
- messageError($q, err);
- })
- .finally(() => {
- hideLoader();
- });
-}
-
/**** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาแล้วเปิด modal */
watch(
() => props.modal,
@@ -453,62 +434,10 @@ watch(
v-if="props.leaveStatus != 'DELETE'"
style="width: 900px; max-width: 80vw"
>
-
-
- {{ ` ${titleMain} ${titleName}` }}
-
- ดาวน์โหลดไฟล์
-
-
-
-
-
-
- ไฟล์ .DOCX
-
-
-
-
-
- ไฟล์ .pdf
-
-
-
-
-
-
-
+
@@ -651,62 +580,10 @@ watch(
-
-
- {{ ` ${titleMainCancle} ${titleName}` }}
-
- ดาวน์โหลดไฟล์
-
-
-
-
-
-
- ไฟล์ .DOCX
-
-
-
-
-
- ไฟล์ .pdf
-
-
-
-
-
-
-
+
diff --git a/src/plugins/genreport.ts b/src/plugins/genreport.ts
index 500dca4..19e2856 100644
--- a/src/plugins/genreport.ts
+++ b/src/plugins/genreport.ts
@@ -2,6 +2,7 @@ import axios from "axios";
import config from "@/app.config";
import { useCounterMixin } from "@/stores/mixin";
+import { downloadBlobFile } from "@/modules/10_registry/utils/downloadFile";
const mixin = useCounterMixin();
const { showLoader, hideLoader } = mixin;
@@ -31,16 +32,11 @@ async function genReport(data: any, fileName: string, type: string = "docx") {
const url = URL.createObjectURL(blob);
const baseName = fileName.trim();
- const extension = type === "docx" ? "docx" : "pdf";
- const link = document.createElement("a");
- link.href = url;
- link.download = `${baseName}.${extension}`;
- document.body.appendChild(link);
- link.click();
- setTimeout(() => {
- document.body.removeChild(link);
- URL.revokeObjectURL(url);
- }, 100);
+ // const extension = type === "docx" ? "docx" : "pdf";
+ await downloadBlobFile({
+ downloadUrl: url,
+ fileName: baseName,
+ });
}
})
.catch((err) => {