diff --git a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue b/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue index d2d2021e5..ba85e5cf2 100644 --- a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue +++ b/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue @@ -61,8 +61,8 @@ const formData = reactive({ leaveLimit: 0, //โควต้าลา(แต่ละประเภท)หน่วยเป็นวัน leaveTotal: 0, //ลาป่วยไปแล้ว(แต่ละประเภท)หน่วยเป็นวัน leaveRemain: 0, //คงเหลือโควต้า(แต่ละประเภท)หน่วยเป็นวัน - leaveStartDate: new Date(), //*วัน เดือน ปีเริ่มต้นลา - leaveEndDate: new Date(), //*วัน เดือน ปีสิ้นสุดลา + leaveDateStart: new Date(), //*วัน เดือน ปีเริ่มต้นลา + leaveDateEnd: new Date(), //*วัน เดือน ปีสิ้นสุดลา leaveWrote: "", //เขียนที่ leaveAddress: "", //สถานที่ติดต่อขณะลา leaveNumber: "", //หมายเลขที่ติดต่อขณะลา @@ -137,8 +137,8 @@ function fetchDetailLeave(paramsId: string) { formData.leaveLimit = e.leaveLimit; formData.leaveTotal = e.leaveTotal; formData.leaveRemain = e.leaveRemain; - formData.leaveStartDate = e.leaveStartDate && date2Thai(e.leaveStartDate); - formData.leaveEndDate = e.leaveEndDate && date2Thai(e.leaveEndDate); + formData.leaveDateStart = e.leaveStartDate && date2Thai(e.leaveStartDate); + formData.leaveDateEnd = e.leaveEndDate && date2Thai(e.leaveEndDate); formData.status = e.status; formData.leaveWrote = e.leaveWrote; formData.leaveAddress = e.leaveAddress; diff --git a/src/modules/09_leave/components/3_Report/DetailReport.vue b/src/modules/09_leave/components/3_Report/DetailReport.vue new file mode 100644 index 000000000..7762359a6 --- /dev/null +++ b/src/modules/09_leave/components/3_Report/DetailReport.vue @@ -0,0 +1,480 @@ + + + + diff --git a/src/modules/09_leave/interface/index/Main.ts b/src/modules/09_leave/interface/index/Main.ts index e76abc1f2..58ada0de4 100644 --- a/src/modules/09_leave/interface/index/Main.ts +++ b/src/modules/09_leave/interface/index/Main.ts @@ -6,4 +6,8 @@ interface DataOption2 { id: number; name: string; } -export type { DataOption, DataOption2 }; +interface DataDateMonthObject { + month: number; + year: number; +} +export type { DataOption, DataOption2, DataDateMonthObject }; diff --git a/src/modules/09_leave/router.ts b/src/modules/09_leave/router.ts index 9724f3d98..57d06f504 100644 --- a/src/modules/09_leave/router.ts +++ b/src/modules/09_leave/router.ts @@ -1,6 +1,8 @@ const workMain = () => import("@/modules/09_leave/views/WorkingMain.vue"); const leaveMain = () => import("@/modules/09_leave/views/LeaveListMain.vue"); const reportMain = () => import("@/modules/09_leave/views/ReportMain.vue"); +const reportDetail = () => + import("@/modules/09_leave/components/3_Report/DetailReport.vue"); const leaveDetail = () => import("@/modules/09_leave/components/2_Leave/DetailLeave.vue"); const leaveDetailReject = () => @@ -102,4 +104,14 @@ export default [ Role: "coin", }, }, + { + path: "/statistics-report/:type", + name: "/statistics-report-detail", + component: reportDetail, + meta: { + Auth: true, + Key: [9], + Role: "coin", + }, + }, ]; diff --git a/src/modules/09_leave/views/ReportMain.vue b/src/modules/09_leave/views/ReportMain.vue index d57fa0695..4892317d7 100644 --- a/src/modules/09_leave/views/ReportMain.vue +++ b/src/modules/09_leave/views/ReportMain.vue @@ -1,9 +1,66 @@ - + - +