From 99419877c41afa26dfe58b0c0e9211dcbac9a861 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 25 Nov 2024 13:18:11 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20Code=20?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A5=E0=B8=B2=E0=B8=A5=E0=B8=87?=
 =?UTF-8?q?=E0=B9=80=E0=B8=A7=E0=B8=A5=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DialogForm.vue                            | 18 ++++++----
 .../{1_Work => 02_WorkList}/DialogDetail.vue  |  2 +-
 .../{1_Work => 02_WorkList}/DialogEdit.vue    | 12 +++----
 .../{1_Work => 02_WorkList}/DialogMap.vue     |  0
 .../{1_Work => 02_WorkList}/DialogReport.vue  | 10 +++---
 .../{1_Work => 02_WorkList}/Tab1.vue          |  5 +--
 .../{1_Work => 02_WorkList}/Tab2.vue          |  6 ++--
 .../{1_Work => 02_WorkList}/TableList.vue     |  6 ++--
 .../{1_Work => 02_WorkList}/ToolBar.vue       |  0
 .../{1_Work => 02_WorkList}/ToolBarDate.vue   |  0
 .../DialogForm.vue                            |  0
 .../DialogApprove.vue                         |  0
 .../Table.vue                                 |  0
 .../{2_Leave => 05_Leave}/Calendar.vue        |  0
 .../{2_Leave => 05_Leave}/DetailLeave.vue     | 24 ++++++-------
 .../DetailLeaveReject.vue                     | 24 ++++++-------
 .../components/{2_Leave => 05_Leave}/Tab1.vue | 30 ++++++++--------
 .../components/{2_Leave => 05_Leave}/Tab2.vue | 34 +++----------------
 .../{2_Leave => 05_Leave}/TableList.vue       |  6 ++--
 .../{2_Leave => 05_Leave}/ToolBarLeave.vue    |  0
 .../formDetail/formCheckSelect.vue            |  0
 .../formDetail/formChildbirth.vue             |  0
 .../formDetail/formHajj.vue                   |  0
 .../formDetail/formHoliday.vue                |  0
 .../formDetail/formLeave.vue                  |  0
 .../formDetail/formLeaveToTraining.vue        |  0
 .../formLeaveToWorkInternational.vue          |  0
 .../formDetail/formMain.vue                   |  0
 .../formDetail/formSpouse.vue                 |  0
 .../formDetail/formStudy.vue                  |  0
 .../formDetail/formUpasom.vue                 |  0
 .../formVocationalRehabilitation.vue          |  0
 .../09_leave/interface/request/changeRound.ts |  4 +--
 src/modules/09_leave/router.ts                | 17 +++++-----
 .../09_leave/stores/ChangeRoundStore.ts       |  4 +--
 src/modules/09_leave/stores/RoundStores.ts    |  2 +-
 .../views/{RoundMain.vue => 01_RoundMain.vue} | 25 +++++++-------
 .../{WorkingMain.vue => 02_WorkingMain.vue}   |  6 ++--
 ...geRoundMain.vue => 03_ChangeRoundMain.vue} |  8 ++---
 ...ialTimeMain.vue => 04_SpecialTimeMain.vue} | 10 +++---
 ...LeaveListMain.vue => 05_LeaveListMain.vue} |  4 +--
 .../06_ReportMain.vue}                        | 14 ++++----
 42 files changed, 123 insertions(+), 148 deletions(-)
 rename src/modules/09_leave/components/{3_WorkTime => 01_RoundTime}/DialogForm.vue (97%)
 rename src/modules/09_leave/components/{1_Work => 02_WorkList}/DialogDetail.vue (99%)
 rename src/modules/09_leave/components/{1_Work => 02_WorkList}/DialogEdit.vue (94%)
 rename src/modules/09_leave/components/{1_Work => 02_WorkList}/DialogMap.vue (100%)
 rename src/modules/09_leave/components/{1_Work => 02_WorkList}/DialogReport.vue (97%)
 rename src/modules/09_leave/components/{1_Work => 02_WorkList}/Tab1.vue (97%)
 rename src/modules/09_leave/components/{1_Work => 02_WorkList}/Tab2.vue (96%)
 rename src/modules/09_leave/components/{1_Work => 02_WorkList}/TableList.vue (96%)
 rename src/modules/09_leave/components/{1_Work => 02_WorkList}/ToolBar.vue (100%)
 rename src/modules/09_leave/components/{1_Work => 02_WorkList}/ToolBarDate.vue (100%)
 rename src/modules/09_leave/components/{4_ChangeRound => 03_ChangeRound}/DialogForm.vue (100%)
 rename src/modules/09_leave/components/{4_specialTime => 04_SpecialTime}/DialogApprove.vue (100%)
 rename src/modules/09_leave/components/{4_specialTime => 04_SpecialTime}/Table.vue (100%)
 rename src/modules/09_leave/components/{2_Leave => 05_Leave}/Calendar.vue (100%)
 rename src/modules/09_leave/components/{2_Leave => 05_Leave}/DetailLeave.vue (95%)
 rename src/modules/09_leave/components/{2_Leave => 05_Leave}/DetailLeaveReject.vue (94%)
 rename src/modules/09_leave/components/{2_Leave => 05_Leave}/Tab1.vue (83%)
 rename src/modules/09_leave/components/{2_Leave => 05_Leave}/Tab2.vue (74%)
 rename src/modules/09_leave/components/{2_Leave => 05_Leave}/TableList.vue (98%)
 rename src/modules/09_leave/components/{2_Leave => 05_Leave}/ToolBarLeave.vue (100%)
 rename src/modules/09_leave/components/{2_Leave => 05_Leave}/formDetail/formCheckSelect.vue (100%)
 rename src/modules/09_leave/components/{2_Leave => 05_Leave}/formDetail/formChildbirth.vue (100%)
 rename src/modules/09_leave/components/{2_Leave => 05_Leave}/formDetail/formHajj.vue (100%)
 rename src/modules/09_leave/components/{2_Leave => 05_Leave}/formDetail/formHoliday.vue (100%)
 rename src/modules/09_leave/components/{2_Leave => 05_Leave}/formDetail/formLeave.vue (100%)
 rename src/modules/09_leave/components/{2_Leave => 05_Leave}/formDetail/formLeaveToTraining.vue (100%)
 rename src/modules/09_leave/components/{2_Leave => 05_Leave}/formDetail/formLeaveToWorkInternational.vue (100%)
 rename src/modules/09_leave/components/{2_Leave => 05_Leave}/formDetail/formMain.vue (100%)
 rename src/modules/09_leave/components/{2_Leave => 05_Leave}/formDetail/formSpouse.vue (100%)
 rename src/modules/09_leave/components/{2_Leave => 05_Leave}/formDetail/formStudy.vue (100%)
 rename src/modules/09_leave/components/{2_Leave => 05_Leave}/formDetail/formUpasom.vue (100%)
 rename src/modules/09_leave/components/{2_Leave => 05_Leave}/formDetail/formVocationalRehabilitation.vue (100%)
 rename src/modules/09_leave/views/{RoundMain.vue => 01_RoundMain.vue} (94%)
 rename src/modules/09_leave/views/{WorkingMain.vue => 02_WorkingMain.vue} (87%)
 rename src/modules/09_leave/views/{ChangeRoundMain.vue => 03_ChangeRoundMain.vue} (98%)
 rename src/modules/09_leave/views/{SpecialTimeMain.vue => 04_SpecialTimeMain.vue} (98%)
 rename src/modules/09_leave/views/{LeaveListMain.vue => 05_LeaveListMain.vue} (88%)
 rename src/modules/09_leave/{components/3_Report/LeaveReport.vue => views/06_ReportMain.vue} (98%)

diff --git a/src/modules/09_leave/components/3_WorkTime/DialogForm.vue b/src/modules/09_leave/components/01_RoundTime/DialogForm.vue
similarity index 97%
rename from src/modules/09_leave/components/3_WorkTime/DialogForm.vue
rename to src/modules/09_leave/components/01_RoundTime/DialogForm.vue
index 96dfb155e..e225204db 100644
--- a/src/modules/09_leave/components/3_WorkTime/DialogForm.vue
+++ b/src/modules/09_leave/components/01_RoundTime/DialogForm.vue
@@ -16,7 +16,7 @@ import DialogHeader from "@/components/DialogHeader.vue";
 const $q = useQuasar();
 
 const mixin = useCounterMixin();
-const { dialogConfirm, success, messageError } = mixin;
+const { dialogConfirm, success, messageError, showLoader, hideLoader } = mixin;
 const isRead = defineModel<boolean>("isRead", { required: true });
 /** propsData จาก RoundMain */
 const props = defineProps({
@@ -104,22 +104,25 @@ function onSubmit() {
 
 /** Function สร้างรอบการปฏิบัติงาน*/
 async function postRoundDuty() {
+  showLoader();
   await http
     .post(config.API.roundDutytime(), formData)
-    .then(() => {
+    .then(async () => {
+      await props.fetchData?.();
+      await props.closeDialog?.();
       success($q, "บันทึกข้อมูล");
     })
     .catch((err) => {
       messageError($q, err);
     })
     .finally(() => {
-      props.fetchData?.();
-      props.closeDialog?.();
+      hideLoader();
     });
 }
 
 /** Functiom แก้ไข้รอบการปฏิบัติงาน*/
 async function putRoundDuty(id: string) {
+  showLoader();
   const data = {
     description: formData.description,
     isDefault: formData.isDefault,
@@ -127,15 +130,16 @@ async function putRoundDuty(id: string) {
   };
   await http
     .put(config.API.roundDutytimeByid(id), data)
-    .then(() => {
+    .then(async () => {
+      await props.fetchData?.();
+      await props.closeDialog?.();
       success($q, "บันทึกข้อมูล");
     })
     .catch((err) => {
       messageError($q, err);
     })
     .finally(() => {
-      props.fetchData?.();
-      props.closeDialog?.();
+      hideLoader();
     });
 }
 
diff --git a/src/modules/09_leave/components/1_Work/DialogDetail.vue b/src/modules/09_leave/components/02_WorkList/DialogDetail.vue
similarity index 99%
rename from src/modules/09_leave/components/1_Work/DialogDetail.vue
rename to src/modules/09_leave/components/02_WorkList/DialogDetail.vue
index 1a58058d9..2f24fad01 100644
--- a/src/modules/09_leave/components/1_Work/DialogDetail.vue
+++ b/src/modules/09_leave/components/02_WorkList/DialogDetail.vue
@@ -8,7 +8,7 @@ import { useQuasar } from "quasar";
 import type { FormDetail } from "@/modules/09_leave/interface/response/work";
 
 /** importComponents*/
-import Map from "@/modules/09_leave/components/1_Work/DialogMap.vue";
+import Map from "@/modules/09_leave/components/02_WorkList/DialogMap.vue";
 
 /** importStores */
 import { useCounterMixin } from "@/stores/mixin";
diff --git a/src/modules/09_leave/components/1_Work/DialogEdit.vue b/src/modules/09_leave/components/02_WorkList/DialogEdit.vue
similarity index 94%
rename from src/modules/09_leave/components/1_Work/DialogEdit.vue
rename to src/modules/09_leave/components/02_WorkList/DialogEdit.vue
index 4245853cb..b9649d968 100644
--- a/src/modules/09_leave/components/1_Work/DialogEdit.vue
+++ b/src/modules/09_leave/components/02_WorkList/DialogEdit.vue
@@ -65,7 +65,9 @@ async function onClickSave() {
       showLoader();
       await http
         .put(config.API.leaveEditCheckin(props.detail?.id), body)
-        .then(() => {
+        .then(async () => {
+          await props.fetchData?.();
+          await props.close?.();
           success($q, "บันทึกข้อมูลสำเร็จ");
         })
         .catch((err) => {
@@ -73,14 +75,12 @@ async function onClickSave() {
         })
         .finally(() => {
           hideLoader();
-          props.fetchData?.();
-          props.close?.();
         });
     });
   }
 }
 
-function filterFnOptions(val: any, update: Function) {
+function filterFnOptions(val: string, update: Function) {
   update(() => {
     options.value = optionsMain.value.filter(
       (v: DataOption) => v.name.indexOf(val) > -1
@@ -143,7 +143,7 @@ watch(
               :rules="[(val:string) => !!val || `${'กรุณาเลือกสถานะ'}`]"
               hide-bottom-space
               use-input
-              @filter="(inputValue: any,doneFn: Function) => filterFnOptions(inputValue, doneFn)"
+              @filter="(inputValue: string,doneFn: Function) => filterFnOptions(inputValue, doneFn)"
               ><template v-slot:no-option>
                 <q-item>
                   <q-item-section class="text-grey">
@@ -178,7 +178,7 @@ watch(
               :rules="[(val:string) => !!val || `${'กรุณาเลือกสถานะ'}`]"
               hide-bottom-space
               use-input
-              @filter="(inputValue: any,doneFn: Function) => filterFnOptions(inputValue, doneFn)"
+              @filter="(inputValue: string,doneFn: Function) => filterFnOptions(inputValue, doneFn)"
               ><template v-slot:no-option>
                 <q-item>
                   <q-item-section class="text-grey">
diff --git a/src/modules/09_leave/components/1_Work/DialogMap.vue b/src/modules/09_leave/components/02_WorkList/DialogMap.vue
similarity index 100%
rename from src/modules/09_leave/components/1_Work/DialogMap.vue
rename to src/modules/09_leave/components/02_WorkList/DialogMap.vue
diff --git a/src/modules/09_leave/components/1_Work/DialogReport.vue b/src/modules/09_leave/components/02_WorkList/DialogReport.vue
similarity index 97%
rename from src/modules/09_leave/components/1_Work/DialogReport.vue
rename to src/modules/09_leave/components/02_WorkList/DialogReport.vue
index 007efd4b2..eddf37943 100644
--- a/src/modules/09_leave/components/1_Work/DialogReport.vue
+++ b/src/modules/09_leave/components/02_WorkList/DialogReport.vue
@@ -21,8 +21,8 @@ const mixin = useCounterMixin();
 const $q = useQuasar();
 const { date2Thai, monthYear2Thai, dateToISO, messageError } = mixin;
 
-const apiGenReport =
-  "https://report-server.frappet.synology.me/api/v1/report-template/xlsx";
+// const apiGenReport =
+//   "https://report-server.frappet.synology.me/api/v1/report-template/xlsx";
 
 const props = defineProps({
   modal: {
@@ -126,7 +126,7 @@ function filterFnOptions(val: any, update: Function) {
  */
 async function genReportXLSX(data: any) {
   await axios
-    .post(apiGenReport, data, {
+    .post(`${config.API.reportTemplate}/xlsx`, data, {
       headers: {
         accept:
           "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
@@ -134,9 +134,9 @@ async function genReportXLSX(data: any) {
       },
       responseType: "blob",
     })
-    .then((res) => {
+    .then(async (res) => {
       const blob = new Blob([res.data]);
-      downloadReport(blob, "xlsx");
+      await downloadReport(blob, "xlsx");
     })
     .catch(async (e) => {
       messageError($q, JSON.parse(await e.response.data.text()));
diff --git a/src/modules/09_leave/components/1_Work/Tab1.vue b/src/modules/09_leave/components/02_WorkList/Tab1.vue
similarity index 97%
rename from src/modules/09_leave/components/1_Work/Tab1.vue
rename to src/modules/09_leave/components/02_WorkList/Tab1.vue
index cd820c101..484ec5b44 100644
--- a/src/modules/09_leave/components/1_Work/Tab1.vue
+++ b/src/modules/09_leave/components/02_WorkList/Tab1.vue
@@ -12,8 +12,8 @@ import type {
 } from "@/modules/09_leave/interface/response/work";
 
 /** importComponents */
-import ToolBar from "@/modules/09_leave/components/1_Work/ToolBar.vue";
-import TableList from "@/modules/09_leave/components/1_Work/TableList.vue";
+import ToolBar from "@/modules/09_leave/components/02_WorkList/ToolBar.vue";
+import TableList from "@/modules/09_leave/components/02_WorkList/TableList.vue";
 
 /** importStores */
 import { useCounterMixin } from "@/stores/mixin";
@@ -121,6 +121,7 @@ const rows = ref<TableRowsTime[]>([]);
 
 /** function เรียกข้อมูล รายการลงเวลาที่ประมวลผลแล้ว*/
 async function fetchListTimeRecord() {
+  rows.value = [];
   const date = new Date(workStore.selectDate as string | Date);
   const querySting = {
     startDate: dateToISO(date), //*วันที่เริ่ม
diff --git a/src/modules/09_leave/components/1_Work/Tab2.vue b/src/modules/09_leave/components/02_WorkList/Tab2.vue
similarity index 96%
rename from src/modules/09_leave/components/1_Work/Tab2.vue
rename to src/modules/09_leave/components/02_WorkList/Tab2.vue
index 5b4742843..5bfa5752e 100644
--- a/src/modules/09_leave/components/1_Work/Tab2.vue
+++ b/src/modules/09_leave/components/02_WorkList/Tab2.vue
@@ -12,8 +12,8 @@ import type {
 } from "@/modules/09_leave/interface/response/work";
 
 /** importComponents */
-import ToolBarDate from "@/modules/09_leave/components/1_Work/ToolBarDate.vue";
-import TableList from "@/modules/09_leave/components/1_Work/TableList.vue";
+import ToolBarDate from "@/modules/09_leave/components/02_WorkList/ToolBarDate.vue";
+import TableList from "@/modules/09_leave/components/02_WorkList/TableList.vue";
 
 /** importStores */
 import { useCounterMixin } from "@/stores/mixin";
@@ -102,6 +102,7 @@ const maxPage = ref<number>(1);
 
 /** function เรียกข้อมูลรายการลงเวลาปฏิบัติงาน (รายการลงเวลา) */
 async function fetchListLogRecord() {
+  rows.value = [];
   showLoader();
   const date = new Date(workStore.selectDate as string | Date);
   await http
@@ -132,7 +133,6 @@ async function fetchListLogRecord() {
     })
     .catch((err) => {
       messageError($q, err);
-      rows.value = [];
     })
     .finally(() => {
       hideLoader();
diff --git a/src/modules/09_leave/components/1_Work/TableList.vue b/src/modules/09_leave/components/02_WorkList/TableList.vue
similarity index 96%
rename from src/modules/09_leave/components/1_Work/TableList.vue
rename to src/modules/09_leave/components/02_WorkList/TableList.vue
index 565121632..d61e0ceec 100644
--- a/src/modules/09_leave/components/1_Work/TableList.vue
+++ b/src/modules/09_leave/components/02_WorkList/TableList.vue
@@ -5,8 +5,8 @@ import { checkPermission } from "@/utils/permissions";
 import { useWorklistDataStore } from "@/modules/09_leave/stores/WorkStore";
 
 /** importComponents */
-import DialogDetail from "@/modules/09_leave/components/1_Work/DialogDetail.vue";
-import DialogEdit from "@/modules/09_leave/components/1_Work/DialogEdit.vue";
+import DialogDetail from "@/modules/09_leave/components/02_WorkList/DialogDetail.vue";
+import DialogEdit from "@/modules/09_leave/components/02_WorkList/DialogEdit.vue";
 
 const workStore = useWorklistDataStore();
 const props = defineProps({
@@ -44,7 +44,7 @@ const emit = defineEmits(["update:pagination"]);
 
 /** ข้อมูล popup */
 const modal = ref<boolean>(false);
-const dataDetail = ref<any>([]);
+const dataDetail = ref<any>();
 const modalEdit = ref<boolean>(false);
 
 /** pagination */
diff --git a/src/modules/09_leave/components/1_Work/ToolBar.vue b/src/modules/09_leave/components/02_WorkList/ToolBar.vue
similarity index 100%
rename from src/modules/09_leave/components/1_Work/ToolBar.vue
rename to src/modules/09_leave/components/02_WorkList/ToolBar.vue
diff --git a/src/modules/09_leave/components/1_Work/ToolBarDate.vue b/src/modules/09_leave/components/02_WorkList/ToolBarDate.vue
similarity index 100%
rename from src/modules/09_leave/components/1_Work/ToolBarDate.vue
rename to src/modules/09_leave/components/02_WorkList/ToolBarDate.vue
diff --git a/src/modules/09_leave/components/4_ChangeRound/DialogForm.vue b/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue
similarity index 100%
rename from src/modules/09_leave/components/4_ChangeRound/DialogForm.vue
rename to src/modules/09_leave/components/03_ChangeRound/DialogForm.vue
diff --git a/src/modules/09_leave/components/4_specialTime/DialogApprove.vue b/src/modules/09_leave/components/04_SpecialTime/DialogApprove.vue
similarity index 100%
rename from src/modules/09_leave/components/4_specialTime/DialogApprove.vue
rename to src/modules/09_leave/components/04_SpecialTime/DialogApprove.vue
diff --git a/src/modules/09_leave/components/4_specialTime/Table.vue b/src/modules/09_leave/components/04_SpecialTime/Table.vue
similarity index 100%
rename from src/modules/09_leave/components/4_specialTime/Table.vue
rename to src/modules/09_leave/components/04_SpecialTime/Table.vue
diff --git a/src/modules/09_leave/components/2_Leave/Calendar.vue b/src/modules/09_leave/components/05_Leave/Calendar.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/Calendar.vue
rename to src/modules/09_leave/components/05_Leave/Calendar.vue
diff --git a/src/modules/09_leave/components/2_Leave/DetailLeave.vue b/src/modules/09_leave/components/05_Leave/DetailLeave.vue
similarity index 95%
rename from src/modules/09_leave/components/2_Leave/DetailLeave.vue
rename to src/modules/09_leave/components/05_Leave/DetailLeave.vue
index 77116d130..e45daa5ee 100644
--- a/src/modules/09_leave/components/2_Leave/DetailLeave.vue
+++ b/src/modules/09_leave/components/05_Leave/DetailLeave.vue
@@ -16,18 +16,18 @@ import type { LeaveType } from "@/modules/09_leave/interface/response/leave";
 
 /** importForm*/
 import DialogReason from "@/components/Dialogs/PopupReason.vue";
-import FormMain from "@/modules/09_leave/components/2_Leave/formDetail/formMain.vue"; // from ซ้าย
-import FormLeave from "@/modules/09_leave/components/2_Leave/formDetail/formLeave.vue"; // ลาป่วย ลาคลอดบุตร และลากิจส่วนตัว
-import FormChildbirth from "@/modules/09_leave/components/2_Leave/formDetail/formChildbirth.vue"; // ลาไปช่วยเหลือภริยาที่คลอดบุตร
-import FormHoliday from "@/modules/09_leave/components/2_Leave/formDetail/formHoliday.vue"; //ลาพักผ่อน
-import FormUpasom from "@/modules/09_leave/components/2_Leave/formDetail/formUpasom.vue"; // ลาอุปสมบท
-import FormHajj from "@/modules/09_leave/components/2_Leave/formDetail/formHajj.vue"; //ลาประกอบพิธีฮัจญ์
-import FormCheckSelect from "@/modules/09_leave/components/2_Leave/formDetail/formCheckSelect.vue"; //ลาเข้ารับการตรวจเลือกหรือเข้ารับการเตรียมพล
-import FormStudy from "@/modules/09_leave/components/2_Leave/formDetail/formStudy.vue"; //ลาไปศึกษา
-import FormLeaveToTraining from "@/modules/09_leave/components/2_Leave/formDetail/formLeaveToTraining.vue"; // ลาไปฝึกอบรม ปฏิบัติการวิจัย หรือดูงาน
-import FormLeaveToWorkInternational from "@/modules/09_leave/components/2_Leave/formDetail/formLeaveToWorkInternational.vue"; // ลาไปปฏิบัติงานในองค์การระหว่างประเทศ
-import FormSpouse from "@/modules/09_leave/components/2_Leave/formDetail/formSpouse.vue"; // ลาติดตามคู่สมรส
-import FormVocationalRehabilitation from "@/modules/09_leave/components/2_Leave/formDetail/formVocationalRehabilitation.vue"; //ลาไปฟื้นฟูสมรรถภาพด้านอาชีพ
+import FormMain from "@/modules/09_leave/components/05_Leave/formDetail/formMain.vue"; // from ซ้าย
+import FormLeave from "@/modules/09_leave/components/05_Leave/formDetail/formLeave.vue"; // ลาป่วย ลาคลอดบุตร และลากิจส่วนตัว
+import FormChildbirth from "@/modules/09_leave/components/05_Leave/formDetail/formChildbirth.vue"; // ลาไปช่วยเหลือภริยาที่คลอดบุตร
+import FormHoliday from "@/modules/09_leave/components/05_Leave/formDetail/formHoliday.vue"; //ลาพักผ่อน
+import FormUpasom from "@/modules/09_leave/components/05_Leave/formDetail/formUpasom.vue"; // ลาอุปสมบท
+import FormHajj from "@/modules/09_leave/components/05_Leave/formDetail/formHajj.vue"; //ลาประกอบพิธีฮัจญ์
+import FormCheckSelect from "@/modules/09_leave/components/05_Leave/formDetail/formCheckSelect.vue"; //ลาเข้ารับการตรวจเลือกหรือเข้ารับการเตรียมพล
+import FormStudy from "@/modules/09_leave/components/05_Leave/formDetail/formStudy.vue"; //ลาไปศึกษา
+import FormLeaveToTraining from "@/modules/09_leave/components/05_Leave/formDetail/formLeaveToTraining.vue"; // ลาไปฝึกอบรม ปฏิบัติการวิจัย หรือดูงาน
+import FormLeaveToWorkInternational from "@/modules/09_leave/components/05_Leave/formDetail/formLeaveToWorkInternational.vue"; // ลาไปปฏิบัติงานในองค์การระหว่างประเทศ
+import FormSpouse from "@/modules/09_leave/components/05_Leave/formDetail/formSpouse.vue"; // ลาติดตามคู่สมรส
+import FormVocationalRehabilitation from "@/modules/09_leave/components/05_Leave/formDetail/formVocationalRehabilitation.vue"; //ลาไปฟื้นฟูสมรรถภาพด้านอาชีพ
 import WorkFlow from "@/components/Workflow/Main.vue";
 
 /** use */
diff --git a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue b/src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue
similarity index 94%
rename from src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
rename to src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue
index fcf0b5fc4..475ad5c19 100644
--- a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
+++ b/src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue
@@ -19,18 +19,18 @@ import type { FremData } from "@/modules/09_leave/interface/request/leave";
 
 /** importForm*/
 import DialogReason from "@/components/Dialogs/PopupReason.vue";
-import FormMain from "@/modules/09_leave/components/2_Leave/formDetail/formMain.vue"; // from ซ้าย
-import FormLeave from "@/modules/09_leave/components/2_Leave/formDetail/formLeave.vue"; // ลาป่วย ลาคลอดบุตร และลากิจส่วนตัว
-import FormChildbirth from "@/modules/09_leave/components/2_Leave/formDetail/formChildbirth.vue"; // ลาไปช่วยเหลือภริยาที่คลอดบุตร
-import FormHoliday from "@/modules/09_leave/components/2_Leave/formDetail/formHoliday.vue"; //ลาพักผ่อน
-import FormUpasom from "@/modules/09_leave/components/2_Leave/formDetail/formUpasom.vue"; // ลาอุปสมบท
-import FormHajj from "@/modules/09_leave/components/2_Leave/formDetail/formHajj.vue"; //ลาประกอบพิธีฮัจญ์
-import FormCheckSelect from "@/modules/09_leave/components/2_Leave/formDetail/formCheckSelect.vue"; //ลาเข้ารับการตรวจเลือกหรือเข้ารับการเตรียมพล
-import FormStudy from "@/modules/09_leave/components/2_Leave/formDetail/formStudy.vue"; //ลาไปศึกษา
-import FormLeaveToTraining from "@/modules/09_leave/components/2_Leave/formDetail/formLeaveToTraining.vue"; // ลาไปฝึกอบรม ปฏิบัติการวิจัย หรือดูงาน
-import FormLeaveToWorkInternational from "@/modules/09_leave/components/2_Leave/formDetail/formLeaveToWorkInternational.vue"; // ลาไปปฏิบัติงานในองค์การระหว่างประเทศ
-import FormSpouse from "@/modules/09_leave/components/2_Leave/formDetail/formSpouse.vue"; // ลาติดตามคู่สมรส
-import FormVocationalRehabilitation from "@/modules/09_leave/components/2_Leave/formDetail/formVocationalRehabilitation.vue"; //ลาไปฟื้นฟูสมรรถภาพด้านอาชีพ
+import FormMain from "@/modules/09_leave/components/05_Leave/formDetail/formMain.vue"; // from ซ้าย
+import FormLeave from "@/modules/09_leave/components/05_Leave/formDetail/formLeave.vue"; // ลาป่วย ลาคลอดบุตร และลากิจส่วนตัว
+import FormChildbirth from "@/modules/09_leave/components/05_Leave/formDetail/formChildbirth.vue"; // ลาไปช่วยเหลือภริยาที่คลอดบุตร
+import FormHoliday from "@/modules/09_leave/components/05_Leave/formDetail/formHoliday.vue"; //ลาพักผ่อน
+import FormUpasom from "@/modules/09_leave/components/05_Leave/formDetail/formUpasom.vue"; // ลาอุปสมบท
+import FormHajj from "@/modules/09_leave/components/05_Leave/formDetail/formHajj.vue"; //ลาประกอบพิธีฮัจญ์
+import FormCheckSelect from "@/modules/09_leave/components/05_Leave/formDetail/formCheckSelect.vue"; //ลาเข้ารับการตรวจเลือกหรือเข้ารับการเตรียมพล
+import FormStudy from "@/modules/09_leave/components/05_Leave/formDetail/formStudy.vue"; //ลาไปศึกษา
+import FormLeaveToTraining from "@/modules/09_leave/components/05_Leave/formDetail/formLeaveToTraining.vue"; // ลาไปฝึกอบรม ปฏิบัติการวิจัย หรือดูงาน
+import FormLeaveToWorkInternational from "@/modules/09_leave/components/05_Leave/formDetail/formLeaveToWorkInternational.vue"; // ลาไปปฏิบัติงานในองค์การระหว่างประเทศ
+import FormSpouse from "@/modules/09_leave/components/05_Leave/formDetail/formSpouse.vue"; // ลาติดตามคู่สมรส
+import FormVocationalRehabilitation from "@/modules/09_leave/components/05_Leave/formDetail/formVocationalRehabilitation.vue"; //ลาไปฟื้นฟูสมรรถภาพด้านอาชีพ
 import WorkFlow from "@/components/Workflow/Main.vue";
 
 /** use */
diff --git a/src/modules/09_leave/components/2_Leave/Tab1.vue b/src/modules/09_leave/components/05_Leave/Tab1.vue
similarity index 83%
rename from src/modules/09_leave/components/2_Leave/Tab1.vue
rename to src/modules/09_leave/components/05_Leave/Tab1.vue
index d48562785..eca64a497 100644
--- a/src/modules/09_leave/components/2_Leave/Tab1.vue
+++ b/src/modules/09_leave/components/05_Leave/Tab1.vue
@@ -8,14 +8,11 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useLeavelistDataStore } from "@/modules/09_leave/stores/LeaveStore";
 
 /**importType*/
-import type {
-  QuerySting,
-  DateFilter,
-} from "@/modules/09_leave/interface/request/leave";
+import type { QuerySting } from "@/modules/09_leave/interface/request/leave";
 
-import TableList from "@/modules/09_leave/components/2_Leave/TableList.vue";
-import ToolBar from "@/modules/09_leave/components/2_Leave/ToolBarLeave.vue";
-import CalendarView from "@/modules/09_leave/components/2_Leave/Calendar.vue";
+import TableList from "@/modules/09_leave/components/05_Leave/TableList.vue";
+import ToolBar from "@/modules/09_leave/components/05_Leave/ToolBarLeave.vue";
+import CalendarView from "@/modules/09_leave/components/05_Leave/Calendar.vue";
 
 const $q = useQuasar(); //ใช้ noti quasar
 const mixin = useCounterMixin();
@@ -49,13 +46,13 @@ async function fecthLeaveList() {
     showLoader();
     await http
       .post(config.API.leaveList(), querySting)
-      .then((res) => {
+      .then(async (res) => {
         const data = res.data.result;
         totalList.value = Math.ceil(
           res.data.result.total / querySting.pageSize
         );
         total.value = res.data.result.total;
-        leaveStore.fetchListLeave(data.data); /** ส่งข้อมูลไป stores*/
+        await leaveStore.fetchListLeave(data.data); /** ส่งข้อมูลไป stores*/
       })
       .catch((err) => {
         messageError($q, err);
@@ -75,8 +72,7 @@ async function fetchOption() {
     })
     .catch((err) => {
       messageError($q, err);
-    })
-    .finally(() => {});
+    });
 }
 
 function getSearch() {
@@ -95,13 +91,12 @@ watch(
   () => leaveStore.tabView,
   async () => {
     leaveStore.tabView === "list" &&
-      (await fecthLeaveList(), await fetchOption());
+      (await Promise.all([fetchOption(), fecthLeaveList()]));
   }
 );
 
 onMounted(async () => {
-  await fetchOption();
-  await fecthLeaveList();
+  await Promise.all([fetchOption(), fecthLeaveList()]);
 });
 </script>
 <template>
@@ -144,7 +139,12 @@ onMounted(async () => {
     </q-tabs>
   </q-toolbar>
   <div v-if="leaveStore.tabView === 'list'">
-    <ToolBar :dataToobar="dataToobar" v-model:query-sting="querySting" :get-list="fecthLeaveList" :get-search="getSearch"/>
+    <ToolBar
+      :dataToobar="dataToobar"
+      v-model:query-sting="querySting"
+      :get-list="fecthLeaveList"
+      :get-search="getSearch"
+    />
     <TableList
       v-model:total="total"
       v-model:total-list="totalList"
diff --git a/src/modules/09_leave/components/2_Leave/Tab2.vue b/src/modules/09_leave/components/05_Leave/Tab2.vue
similarity index 74%
rename from src/modules/09_leave/components/2_Leave/Tab2.vue
rename to src/modules/09_leave/components/05_Leave/Tab2.vue
index b1c4cf4b1..9daa0ade5 100644
--- a/src/modules/09_leave/components/2_Leave/Tab2.vue
+++ b/src/modules/09_leave/components/05_Leave/Tab2.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, reactive, onMounted,watch } from "vue";
+import { ref, reactive, onMounted, watch } from "vue";
 import { useQuasar } from "quasar";
 
 import http from "@/plugins/http";
@@ -13,8 +13,8 @@ import type {
   DateFilter,
 } from "@/modules/09_leave/interface/request/leave";
 
-import TableList from "@/modules/09_leave/components/2_Leave/TableList.vue";
-import ToolBar from "@/modules/09_leave/components/2_Leave/ToolBarLeave.vue";
+import TableList from "@/modules/09_leave/components/05_Leave/TableList.vue";
+import ToolBar from "@/modules/09_leave/components/05_Leave/ToolBarLeave.vue";
 
 const mixin = useCounterMixin();
 const leaveStore = useLeavelistDataStore();
@@ -63,28 +63,6 @@ async function fecthLeaveList() {
         hideLoader();
       });
   }
-  // const data = APIDATA.data;
-}
-
-/**
- *
- * @param newPage หน้า
- * @param pageSize จำนวนต่อแถว
- * @param dateFilter ข้อมูลค้นหา
- */
-async function updatePaging(
-  newPage: number,
-  pageSize: number,
-  dateFilter: DateFilter
-) {
-  querySting.year = dateFilter ? dateFilter.year : querySting.year;
-  querySting.type = dateFilter ? dateFilter.type : querySting.type;
-  querySting.status = dateFilter ? dateFilter.status : querySting.status;
-  querySting.page = newPage;
-  querySting.pageSize = pageSize ? pageSize : querySting.pageSize;
-  querySting.keyword = dateFilter ? dateFilter.keyword : querySting.keyword;
-
-  await fecthLeaveList();
 }
 
 /** function เรียกข้อมูลสถานะ*/
@@ -96,8 +74,7 @@ async function fetchOption() {
     })
     .catch((err) => {
       messageError($q, err);
-    })
-    .finally(() => {});
+    });
 }
 
 function getSearch() {
@@ -113,8 +90,7 @@ watch(
 );
 
 onMounted(async () => {
-  await fetchOption();
-  await fecthLeaveList();
+  await Promise.all([fetchOption(), fecthLeaveList()]);
 });
 </script>
 <template>
diff --git a/src/modules/09_leave/components/2_Leave/TableList.vue b/src/modules/09_leave/components/05_Leave/TableList.vue
similarity index 98%
rename from src/modules/09_leave/components/2_Leave/TableList.vue
rename to src/modules/09_leave/components/05_Leave/TableList.vue
index 491d3a1c9..30f52e52c 100644
--- a/src/modules/09_leave/components/2_Leave/TableList.vue
+++ b/src/modules/09_leave/components/05_Leave/TableList.vue
@@ -261,7 +261,7 @@ onMounted(() => {
     dense
     class="custom-header-table"
     :visible-columns="leaveStore.visibleColumns"
-    :rows-per-page-options="[1, 25, 50, 100]"
+    :rows-per-page-options="[10, 25, 50, 100]"
     @update:pagination="updatePagination"
   >
     <template v-slot:header="props">
@@ -290,9 +290,7 @@ onMounted(() => {
         <q-td v-for="col in props.cols" :key="col.name" :props="props">
           <div v-if="col.name == 'no'">
             {{
-              (pagination.page - 1) * pagination.pageSize +
-              props.rowIndex +
-              1
+              (pagination.page - 1) * pagination.pageSize + props.rowIndex + 1
             }}
           </div>
           <div v-else-if="col.name == 'leaveTypeName'">
diff --git a/src/modules/09_leave/components/2_Leave/ToolBarLeave.vue b/src/modules/09_leave/components/05_Leave/ToolBarLeave.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/ToolBarLeave.vue
rename to src/modules/09_leave/components/05_Leave/ToolBarLeave.vue
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formCheckSelect.vue b/src/modules/09_leave/components/05_Leave/formDetail/formCheckSelect.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/formDetail/formCheckSelect.vue
rename to src/modules/09_leave/components/05_Leave/formDetail/formCheckSelect.vue
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formChildbirth.vue b/src/modules/09_leave/components/05_Leave/formDetail/formChildbirth.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/formDetail/formChildbirth.vue
rename to src/modules/09_leave/components/05_Leave/formDetail/formChildbirth.vue
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formHajj.vue b/src/modules/09_leave/components/05_Leave/formDetail/formHajj.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/formDetail/formHajj.vue
rename to src/modules/09_leave/components/05_Leave/formDetail/formHajj.vue
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formHoliday.vue b/src/modules/09_leave/components/05_Leave/formDetail/formHoliday.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/formDetail/formHoliday.vue
rename to src/modules/09_leave/components/05_Leave/formDetail/formHoliday.vue
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formLeave.vue b/src/modules/09_leave/components/05_Leave/formDetail/formLeave.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/formDetail/formLeave.vue
rename to src/modules/09_leave/components/05_Leave/formDetail/formLeave.vue
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formLeaveToTraining.vue b/src/modules/09_leave/components/05_Leave/formDetail/formLeaveToTraining.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/formDetail/formLeaveToTraining.vue
rename to src/modules/09_leave/components/05_Leave/formDetail/formLeaveToTraining.vue
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formLeaveToWorkInternational.vue b/src/modules/09_leave/components/05_Leave/formDetail/formLeaveToWorkInternational.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/formDetail/formLeaveToWorkInternational.vue
rename to src/modules/09_leave/components/05_Leave/formDetail/formLeaveToWorkInternational.vue
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formMain.vue b/src/modules/09_leave/components/05_Leave/formDetail/formMain.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/formDetail/formMain.vue
rename to src/modules/09_leave/components/05_Leave/formDetail/formMain.vue
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formSpouse.vue b/src/modules/09_leave/components/05_Leave/formDetail/formSpouse.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/formDetail/formSpouse.vue
rename to src/modules/09_leave/components/05_Leave/formDetail/formSpouse.vue
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formStudy.vue b/src/modules/09_leave/components/05_Leave/formDetail/formStudy.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/formDetail/formStudy.vue
rename to src/modules/09_leave/components/05_Leave/formDetail/formStudy.vue
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formUpasom.vue b/src/modules/09_leave/components/05_Leave/formDetail/formUpasom.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/formDetail/formUpasom.vue
rename to src/modules/09_leave/components/05_Leave/formDetail/formUpasom.vue
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formVocationalRehabilitation.vue b/src/modules/09_leave/components/05_Leave/formDetail/formVocationalRehabilitation.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/formDetail/formVocationalRehabilitation.vue
rename to src/modules/09_leave/components/05_Leave/formDetail/formVocationalRehabilitation.vue
diff --git a/src/modules/09_leave/interface/request/changeRound.ts b/src/modules/09_leave/interface/request/changeRound.ts
index 51154ff24..ed8c9347a 100644
--- a/src/modules/09_leave/interface/request/changeRound.ts
+++ b/src/modules/09_leave/interface/request/changeRound.ts
@@ -1,4 +1,4 @@
-interface dataPost {
+interface DataPost {
   cardId: string;
   firstName: string;
   lastName: string;
@@ -28,7 +28,7 @@ interface MyObjectRoundChangeMainRef {
   [key: string]: any;
 }
 export type {
-  dataPost,
+  DataPost,
   changeRoundEdit,
   MyObjectRoundChangeRef,
   MyObjectRoundChangeMainRef,
diff --git a/src/modules/09_leave/router.ts b/src/modules/09_leave/router.ts
index cda8f8e50..6666df9f0 100644
--- a/src/modules/09_leave/router.ts
+++ b/src/modules/09_leave/router.ts
@@ -1,16 +1,15 @@
-const workMain = () => import("@/modules/09_leave/views/WorkingMain.vue");
-const leaveMain = () => import("@/modules/09_leave/views/LeaveListMain.vue");
+const workMain = () => import("@/modules/09_leave/views/02_WorkingMain.vue");
+const leaveMain = () => import("@/modules/09_leave/views/05_LeaveListMain.vue");
 const leaveDetail = () =>
-  import("@/modules/09_leave/components/2_Leave/DetailLeave.vue");
+  import("@/modules/09_leave/components/05_Leave/DetailLeave.vue");
 const leaveDetailReject = () =>
-  import("@/modules/09_leave/components/2_Leave/DetailLeaveReject.vue");
-const RoundMain = () => import("@/modules/09_leave/views/RoundMain.vue");
+  import("@/modules/09_leave/components/05_Leave/DetailLeaveReject.vue");
+const RoundMain = () => import("@/modules/09_leave/views/01_RoundMain.vue");
 const ChangeRoundMain = () =>
-  import("@/modules/09_leave/views/ChangeRoundMain.vue");
+  import("@/modules/09_leave/views/03_ChangeRoundMain.vue");
 const SpecialTimeMain = () =>
-  import("@/modules/09_leave/views/SpecialTimeMain.vue");
-const leaveReport = () =>
-  import("@/modules/09_leave/components/3_Report/LeaveReport.vue");
+  import("@/modules/09_leave/views/04_SpecialTimeMain.vue");
+const leaveReport = () => import("@/modules/09_leave/views/06_ReportMain.vue");
 export default [
   {
     path: "/round-time",
diff --git a/src/modules/09_leave/stores/ChangeRoundStore.ts b/src/modules/09_leave/stores/ChangeRoundStore.ts
index 6e5250267..183770760 100644
--- a/src/modules/09_leave/stores/ChangeRoundStore.ts
+++ b/src/modules/09_leave/stores/ChangeRoundStore.ts
@@ -116,7 +116,6 @@ export const useChangeRoundDataStore = defineStore(
 
     // ข้อมูลในตาราง
     function setProfileId(id: string) {
-      console.log(profileId);
       profileId.value = id;
     }
 
@@ -125,6 +124,7 @@ export const useChangeRoundDataStore = defineStore(
 
     function fetchDataForCardId(dataDetail: any) {
       if (dataDetail) {
+        rows.value = [];
         showLoader();
         http
           .post(config.API.leaveSearch(), {
@@ -152,8 +152,6 @@ export const useChangeRoundDataStore = defineStore(
                 currentRound: `${e.startTimeMorning}-${e.leaveTimeAfterNoon}`,
                 effectiveDate: date2Thai(e.effectiveDate) ?? "-",
               }));
-              console.log(profileId.value);
-              console.log(apiData.length);
             } else {
               rows.value = [];
               checkCilck.value = true;
diff --git a/src/modules/09_leave/stores/RoundStores.ts b/src/modules/09_leave/stores/RoundStores.ts
index b0f1d5d9e..c25ad5737 100644
--- a/src/modules/09_leave/stores/RoundStores.ts
+++ b/src/modules/09_leave/stores/RoundStores.ts
@@ -62,7 +62,7 @@ export const useRoundDataStore = defineStore("roundWorkStore", () => {
    * Function รับข้อมูลจาก API map
    * @param data รับข้อมูลจาก API
    */
-  function fetchData(data: dataRowRound[]) {
+  async function fetchData(data: dataRowRound[]) {
     let datalist: roundShow[] = data.map((e: dataRowRound) => {
       return {
         id: e.id,
diff --git a/src/modules/09_leave/views/RoundMain.vue b/src/modules/09_leave/views/01_RoundMain.vue
similarity index 94%
rename from src/modules/09_leave/views/RoundMain.vue
rename to src/modules/09_leave/views/01_RoundMain.vue
index 42c03c2c3..0ab49da05 100644
--- a/src/modules/09_leave/views/RoundMain.vue
+++ b/src/modules/09_leave/views/01_RoundMain.vue
@@ -9,7 +9,7 @@ import { useRoundDataStore } from "@/modules/09_leave/stores/RoundStores";
 import { useCounterMixin } from "@/stores/mixin";
 
 /** ImportComponents*/
-import DialogForm from "@/modules/09_leave/components/3_WorkTime/DialogForm.vue";
+import DialogForm from "@/modules/09_leave/components/01_RoundTime/DialogForm.vue";
 import { checkPermission } from "@/utils/permissions";
 
 const $q = useQuasar(); //ใช้ noti quasar
@@ -35,13 +35,13 @@ const resetFilter = () => {
 };
 
 /** Function get ข้อมูลรายการรอบการปฏิบัติงาน */
-async function fetchListRoind() {
+async function fetchListRound() {
   showLoader();
   await http
     .get(config.API.roundDutytime())
-    .then((res) => {
-      const data = res.data.result;
-      fetchData(data);
+    .then(async (res) => {
+      const data = await res.data.result;
+      await fetchData(data);
     })
     .catch((err) => {
       messageError($q, err);
@@ -57,16 +57,18 @@ async function fetchListRoind() {
  */
 function onClickDelete(id: string) {
   dialogRemove($q, async () => {
+    showLoader();
     await http
       .delete(config.API.roundDutytimeByid(id))
-      .then(() => {
+      .then(async () => {
+        await fetchListRound();
         success($q, "ลบข้อมูลสำเร็จ");
       })
       .catch((err) => {
         messageError($q, err);
       })
-      .finally(async () => {
-        await fetchListRoind();
+      .finally(() => {
+        hideLoader();
       });
   });
 }
@@ -112,8 +114,8 @@ const pagination = ref({
 });
 
 /** Hook*/
-onMounted(() => {
-  fetchListRoind();
+onMounted(async () => {
+  await fetchListRound();
 });
 </script>
 <template>
@@ -172,7 +174,6 @@ onMounted(() => {
         map-options
         :options="dataStore.columns"
         option-value="name"
-        
         style="min-width: 140px"
         class="col-xs-12 col-sm-3 col-md-2"
       />
@@ -285,7 +286,7 @@ onMounted(() => {
     :closeDialog="closeDialog"
     :editCheck="editCheck"
     :detailData="detailData"
-    :fetchData="fetchListRoind"
+    :fetchData="fetchListRound"
     v-model:isRead="isRead"
   />
 </template>
diff --git a/src/modules/09_leave/views/WorkingMain.vue b/src/modules/09_leave/views/02_WorkingMain.vue
similarity index 87%
rename from src/modules/09_leave/views/WorkingMain.vue
rename to src/modules/09_leave/views/02_WorkingMain.vue
index 788a1f48d..0335224c2 100644
--- a/src/modules/09_leave/views/WorkingMain.vue
+++ b/src/modules/09_leave/views/02_WorkingMain.vue
@@ -2,9 +2,9 @@
 import { ref } from "vue";
 
 /** import Components */
-import Tab1 from "@/modules/09_leave/components/1_Work/Tab1.vue";
-import Tab2 from "@/modules/09_leave/components/1_Work/Tab2.vue";
-import DialogReport from "@/modules/09_leave/components/1_Work/DialogReport.vue";
+import Tab1 from "@/modules/09_leave/components/02_WorkList/Tab1.vue";
+import Tab2 from "@/modules/09_leave/components/02_WorkList/Tab2.vue";
+import DialogReport from "@/modules/09_leave/components/02_WorkList/DialogReport.vue";
 
 const tab = ref("1");
 
diff --git a/src/modules/09_leave/views/ChangeRoundMain.vue b/src/modules/09_leave/views/03_ChangeRoundMain.vue
similarity index 98%
rename from src/modules/09_leave/views/ChangeRoundMain.vue
rename to src/modules/09_leave/views/03_ChangeRoundMain.vue
index 24633bf0a..52021281d 100644
--- a/src/modules/09_leave/views/ChangeRoundMain.vue
+++ b/src/modules/09_leave/views/03_ChangeRoundMain.vue
@@ -8,9 +8,9 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useChangeRoundDataStore } from "@/modules/09_leave/stores/ChangeRoundStore";
 import { checkPermission } from "@/utils/permissions";
 
-import type { dataPost } from "@/modules/09_leave/interface/request/changeRound";
+import type { DataPost } from "@/modules/09_leave/interface/request/changeRound";
 
-import Dialogform from "@/modules/09_leave/components/4_ChangeRound/DialogForm.vue";
+import Dialogform from "@/modules/09_leave/components/03_ChangeRound/DialogForm.vue";
 
 /** useStore */
 const mixin = useCounterMixin();
@@ -32,7 +32,7 @@ const dateWork = ref<string>("NORMAL");
 const modalFix = ref<boolean>(false);
 const editCheck = ref<string>("");
 const DataRow = ref<any>();
-const formData = reactive<dataPost>({
+const formData = reactive<DataPost>({
   cardId: "",
   firstName: "",
   lastName: "",
@@ -97,12 +97,12 @@ function save() {
       })
       .then(() => {
         success($q, "บันทึกข้อมูลสำเร็จ");
+        closeDialog();
       })
       .catch((err) => {
         messageError($q, err);
       })
       .finally(() => {
-        closeDialog();
         hideLoader();
       });
   });
diff --git a/src/modules/09_leave/views/SpecialTimeMain.vue b/src/modules/09_leave/views/04_SpecialTimeMain.vue
similarity index 98%
rename from src/modules/09_leave/views/SpecialTimeMain.vue
rename to src/modules/09_leave/views/04_SpecialTimeMain.vue
index a42162a49..fde61f269 100644
--- a/src/modules/09_leave/views/SpecialTimeMain.vue
+++ b/src/modules/09_leave/views/04_SpecialTimeMain.vue
@@ -16,7 +16,7 @@ import type {
 } from "@/modules/09_leave/interface/request/specialTime";
 
 import DialogReason from "@/components/Dialogs/PopupReason.vue";
-import DialogApprove from "@/modules/09_leave/components/4_specialTime/DialogApprove.vue";
+import DialogApprove from "@/modules/09_leave/components/04_SpecialTime/DialogApprove.vue";
 
 const $q = useQuasar(); // show dialog
 const mixin = useCounterMixin();
@@ -86,7 +86,6 @@ const visibleColumns = ref<String[]>([
   "timeAfternoon",
   "description",
 ]);
-
 const columns = ref<QTableProps["columns"]>([
   {
     name: "no",
@@ -199,14 +198,14 @@ async function clickSave(reason: string) {
   };
   await http
     .put(config.API.specialTimeReject(id.value), body)
-    .then(() => {
+    .then(async () => {
+      await fetchData();
       success($q, "บันทึกข้อมูลสำเร็จ");
     })
     .catch((e) => {
       messageError($q, e);
     })
-    .finally(async () => {
-      await fetchData();
+    .finally(() => {
       hideLoader();
     });
 }
@@ -396,7 +395,6 @@ onMounted(async () => {
         map-options
         :options="columns"
         option-value="name"
-        
         style="min-width: 140px"
         class="col-xs-12 col-sm-3 col-md-2"
       />
diff --git a/src/modules/09_leave/views/LeaveListMain.vue b/src/modules/09_leave/views/05_LeaveListMain.vue
similarity index 88%
rename from src/modules/09_leave/views/LeaveListMain.vue
rename to src/modules/09_leave/views/05_LeaveListMain.vue
index afba501f3..89258e08d 100644
--- a/src/modules/09_leave/views/LeaveListMain.vue
+++ b/src/modules/09_leave/views/05_LeaveListMain.vue
@@ -3,8 +3,8 @@
 import { useLeavelistDataStore } from "@/modules/09_leave/stores/LeaveStore";
 
 /**importComponets*/
-import Tab1 from "@/modules/09_leave/components/2_Leave/Tab1.vue";
-import Tab2 from "@/modules/09_leave/components/2_Leave/Tab2.vue";
+import Tab1 from "@/modules/09_leave/components/05_Leave/Tab1.vue";
+import Tab2 from "@/modules/09_leave/components/05_Leave/Tab2.vue";
 
 const leaveStore = useLeavelistDataStore();
 </script>
diff --git a/src/modules/09_leave/components/3_Report/LeaveReport.vue b/src/modules/09_leave/views/06_ReportMain.vue
similarity index 98%
rename from src/modules/09_leave/components/3_Report/LeaveReport.vue
rename to src/modules/09_leave/views/06_ReportMain.vue
index eef8fc11a..819acff74 100644
--- a/src/modules/09_leave/components/3_Report/LeaveReport.vue
+++ b/src/modules/09_leave/views/06_ReportMain.vue
@@ -82,17 +82,17 @@ async function fetchLeaveday(
 
   await http
     .post(config.API.leaveReportLeaveday(type), body)
-    .then((res) => {
+    .then(async (res) => {
       const data = res.data.result;
-      data && genReport(data);
-      !data && hideLoader();
+      data && (await genReport(data));
       detailReport.value = data;
     })
     .catch((err) => {
       messageError($q, err);
-      hideLoader();
     })
-    .finally(() => {});
+    .finally(() => {
+      hideLoader();
+    });
 }
 
 /**
@@ -101,7 +101,7 @@ async function fetchLeaveday(
  */
 async function genReport(data: any) {
   await axios
-    .post(apiGenReport, data, {
+    .post(`${config.API.reportTemplate}/xlsx`, data, {
       headers: {
         accept: "application/pdf",
         "content-Type": "application/json",
@@ -135,7 +135,7 @@ async function genReport(data: any) {
  */
 async function genReportXLSX(data: any) {
   await axios
-    .post(apiGenReport, data, {
+    .post(`${config.API.reportTemplate}/xlsx`, data, {
       headers: {
         accept:
           "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",