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"
     >
-      <q-toolbar>
-        <q-toolbar-title class="text-subtitle2 text-bold">
-          {{ ` ${titleMain} ${titleName}` }}
-          <q-btn class="q-mr-sm" icon="mdi-download" round color="primary" flat>
-            <q-tooltip>ดาวน์โหลดไฟล์</q-tooltip>
-            <q-menu>
-              <q-list style="min-width: 100px">
-                <q-item
-                  clickable
-                  v-close-popup
-                  @click="
-                    onClickDownloadFile(
-                      formData.id,
-                      formData.leaveSubTypeName
-                        ? formData.leaveSubTypeName
-                        : formData.leaveTypeName,
-                      'docx',
-                    )
-                  "
-                >
-                  <q-item-section avatar>
-                    <q-icon color="blue" name="mdi-file-word" />
-                  </q-item-section>
-                  <q-item-section>ไฟล์ .DOCX</q-item-section>
-                </q-item>
-                <q-item
-                  clickable
-                  v-close-popup
-                  @click="
-                    onClickDownloadFile(
-                      formData.id,
-                      formData.leaveSubTypeName
-                        ? formData.leaveSubTypeName
-                        : formData.leaveTypeName,
-                      'pdf',
-                    )
-                  "
-                >
-                  <q-item-section avatar>
-                    <q-icon color="red" name="mdi-file-pdf" />
-                  </q-item-section>
-                  <q-item-section>ไฟล์ .pdf</q-item-section>
-                </q-item>
-              </q-list>
-            </q-menu>
-          </q-btn>
-        </q-toolbar-title>
-        <q-btn
-          icon="close"
-          unelevated
-          round
-          dense
-          @click="props.onClickClose?.()"
-          style="color: #ff8080; background-color: #ffdede"
-        />
-      </q-toolbar>
+      <DialogHeader
+        :tittle="`${titleMain} ${titleName}`"
+        :close="props.onClickClose"
+      />
 
       <q-separator />
       <q-card-section v-if="isLoading">
@@ -651,62 +580,10 @@ watch(
     </q-card>
 
     <q-card v-if="props.leaveStatus === 'DELETE'" style="min-width: 40vw">
-      <q-toolbar>
-        <q-toolbar-title class="text-subtitle2 text-bold">
-          {{ ` ${titleMainCancle} ${titleName}` }}
-          <q-btn class="q-mr-sm" icon="mdi-download" round color="primary" flat>
-            <q-tooltip>ดาวน์โหลดไฟล์</q-tooltip>
-            <q-menu>
-              <q-list style="min-width: 100px">
-                <q-item
-                  clickable
-                  v-close-popup
-                  @click="
-                    onClickDownloadFile(
-                      formData.id,
-                      formData.leaveSubTypeName
-                        ? formData.leaveSubTypeName
-                        : formData.leaveTypeName,
-                      'docx',
-                    )
-                  "
-                >
-                  <q-item-section avatar>
-                    <q-icon color="blue" name="mdi-file-word" />
-                  </q-item-section>
-                  <q-item-section>ไฟล์ .DOCX</q-item-section>
-                </q-item>
-                <q-item
-                  clickable
-                  v-close-popup
-                  @click="
-                    onClickDownloadFile(
-                      formData.id,
-                      formData.leaveSubTypeName
-                        ? formData.leaveSubTypeName
-                        : formData.leaveTypeName,
-                      'pdf',
-                    )
-                  "
-                >
-                  <q-item-section avatar>
-                    <q-icon color="red" name="mdi-file-pdf" />
-                  </q-item-section>
-                  <q-item-section>ไฟล์ .pdf</q-item-section>
-                </q-item>
-              </q-list>
-            </q-menu>
-          </q-btn>
-        </q-toolbar-title>
-        <q-btn
-          icon="close"
-          unelevated
-          round
-          dense
-          @click="props.onClickClose?.()"
-          style="color: #ff8080; background-color: #ffdede"
-        />
-      </q-toolbar>
+      <DialogHeader
+        :tittle="`${titleMainCancle} ${titleName}`"
+        :close="props.onClickClose"
+      />
 
       <q-separator />
       <q-card-section v-if="isLoading">
diff --git a/src/modules/05_leave/interface/index/main.ts b/src/modules/05_leave/interface/index/main.ts
index a63d65d..9551977 100644
--- a/src/modules/05_leave/interface/index/main.ts
+++ b/src/modules/05_leave/interface/index/main.ts
@@ -43,7 +43,6 @@ interface LeaveItem {
   all: number;
   use: number;
   remain: number;
-  leaveCountApproveCount: number;
 }
 
 interface MainList {
diff --git a/src/modules/05_leave/views/Main.vue b/src/modules/05_leave/views/Main.vue
index fcaca35..4e36478 100644
--- a/src/modules/05_leave/views/Main.vue
+++ b/src/modules/05_leave/views/Main.vue
@@ -141,14 +141,12 @@ async function fetchStatsTable() {
             value:
               el.leaveLimit > 0
                 ? Math.round(
-                    (Number(el.leaveCountApprove) / Number(el.leaveLimit)) *
-                      100,
+                    (Number(el.leaveCountApprove) / Number(el.leaveLimit)) * 100
                   )
                 : 0,
             all: Number(el.leaveLimit),
             use: el.leaveCountApprove,
             remain: Number(el.leaveLimit) - Number(el.leaveCountApprove),
-            leaveCountApproveCount: el.leaveCountApproveCount,
           }));
       });
       stat.forEach((item) => itemPie.value.push(...item));
@@ -256,7 +254,7 @@ onMounted(async () => {
                     </q-knob>
                   </div>
                   <div class="col-12 text-center text-weight-medium">
-                    {{ item.text }}
+                    ลาพักผ่อน
                   </div>
                 </div>
                 <div class="row gt-xs"><q-separator vertical /></div>
@@ -264,19 +262,17 @@ onMounted(async () => {
                   <div class="col-12 row text-dark text-body2 items-center">
                     <div class="col-12 row q-pa-xs q-px-md row">
                       <span class="text-grey-7 col-6">ได้รับ</span>
-                      <span class="text-weight-bold">{{ item.all }} วัน</span>
+                      <span class="text-weight-bold">{{ item.all }}</span>
                     </div>
                     <div class="col-12"><q-separator /></div>
                     <div class="col-12 row q-pa-xs q-px-md">
                       <span class="text-grey-7 col-6">ใช้ไป</span>
-                      <span class="text-weight-bold">{{ item.use }} วัน </span>
+                      <span class="text-weight-bold">{{ item.use }}</span>
                     </div>
                     <div class="col-12"><q-separator /></div>
                     <div class="col-12 row q-pa-xs q-px-md">
                       <span class="text-grey-7 col-6">คงเหลือ</span>
-                      <span class="text-weight-bold"
-                        >{{ item.remain }} วัน</span
-                      >
+                      <span class="text-weight-bold">{{ item.remain }}</span>
                     </div>
                   </div>
                 </div>
@@ -298,11 +294,11 @@ onMounted(async () => {
                     flat
                     class="shadow-0 col-12 fit row items-center q-px-lg"
                   >
-                    <div class="text-subtitle2 col-4">{{ item.text }}</div>
+                    <div class="text-subtitle2 col-4">ลาป่วย</div>
                     <div class="text-subtitle2 col-8">
                       <span class="text-grey-7 q-pr-md">ใช้ไป</span>
-                      <span class="text-weight-bold">{{ item.use }} วัน </span>
-                      ({{ item.leaveCountApproveCount }} ครั้ง)
+                      <span class="text-weight-bold">{{ item.use }}</span>
+                      <!-- <span class="text-grey-7 q-pl-md">ลา</span> -->
                     </div>
                   </q-card>
                 </div>
@@ -321,11 +317,11 @@ onMounted(async () => {
                     flat
                     class="shadow-0 col-12 fit row items-center q-px-lg"
                   >
-                    <div class="text-subtitle2 col-4">{{ item.text }}</div>
+                    <div class="text-subtitle2 col-4">ลากิจส่วนตัว</div>
                     <div class="text-subtitle2 col-8">
                       <span class="text-grey-7 q-pr-md">ใช้ไป</span>
-                      <span class="text-weight-bold">{{ item.use }} วัน </span>
-                      ({{ item.leaveCountApproveCount }} ครั้ง)
+                      <span class="text-weight-bold">{{ item.use }}</span>
+                      <!-- <span class="text-grey-7 q-pl-md">ลา</span> -->
                     </div>
                   </q-card>
                 </div>
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) => {