diff --git a/src/modules/09_leave/components/2_Leave/DetailLeave.vue b/src/modules/09_leave/components/2_Leave/DetailLeave.vue index 155ad2055..2a3f9e7f0 100644 --- a/src/modules/09_leave/components/2_Leave/DetailLeave.vue +++ b/src/modules/09_leave/components/2_Leave/DetailLeave.vue @@ -18,7 +18,7 @@ const paramsId = route.params.id; class="q-mr-sm" @click="router.push(`/leave-list`)" /> - รายละเอียดการลาของ {{ paramsId }} + รายละเอียดการลาของ นายปิยรมย์ ศิริธาราฟ
ชื่อ - นามสกุล
-
{{ paramsId }}
+
นายปิยรมย์ ศิริธาราฟ
diff --git a/src/modules/09_leave/components/2_Leave/TableList.vue b/src/modules/09_leave/components/2_Leave/TableList.vue index 834c1959a..4627e2220 100644 --- a/src/modules/09_leave/components/2_Leave/TableList.vue +++ b/src/modules/09_leave/components/2_Leave/TableList.vue @@ -118,7 +118,7 @@ const paginationLabel = (start: string, end: string, total: string) => { v-for="col in props.cols" :key="col.name" :props="props" - @click.prevent="router.push(`/leave/detail/${props.row.name}`)" + @click.prevent="router.push(`/leave/detail/${props.row.id}`)" >
{{ props.rowIndex + 1 }} diff --git a/src/modules/09_leave/interface/request/leave.ts b/src/modules/09_leave/interface/request/leave.ts new file mode 100644 index 000000000..674688ccc --- /dev/null +++ b/src/modules/09_leave/interface/request/leave.ts @@ -0,0 +1,10 @@ +interface ListsData { + id: string; + leaveType: string + name: string + Date: string + status: string +} +export type { + ListsData +} \ No newline at end of file diff --git a/src/modules/09_leave/stores/LeaveStore.ts b/src/modules/09_leave/stores/LeaveStore.ts index 576c1eb74..fcc7a0c30 100644 --- a/src/modules/09_leave/stores/LeaveStore.ts +++ b/src/modules/09_leave/stores/LeaveStore.ts @@ -5,6 +5,7 @@ import { useCounterMixin } from "@/stores/mixin"; import type { DataOption } from "@/modules/09_leave/interface/index/Main"; import type { QTableProps } from "quasar"; import type { DataRows } from "@/modules/09_leave/interface/response/leave"; +import type { ListsData } from "@/modules/09_leave/interface/request/leave"; const mixin = useCounterMixin(); const { date2Thai, showLoader, hideLoader } = mixin; @@ -18,8 +19,9 @@ export const useLeavelistDataStore = defineStore("leave", () => { const columns = ref([]); const visibleColumns = ref([]); const loadTable = ref(false); - async function fetchList(data: DataRows[]) { - let datalist = data.map((e: DataRows) => ({ + async function fetchList(data: ListsData[]) { + let datalist = data.map((e: ListsData) => ({ + id: e.id, leaveType: e.leaveType, name: e.name, Date: date2Thai(e.Date), diff --git a/src/modules/09_leave/views/LeaveListMain.vue b/src/modules/09_leave/views/LeaveListMain.vue index b7a5a4e60..da8303374 100644 --- a/src/modules/09_leave/views/LeaveListMain.vue +++ b/src/modules/09_leave/views/LeaveListMain.vue @@ -17,24 +17,28 @@ onMounted(() => { function fecthLeaveList() { const data = [ { + id: "00000000-0000-0000-0000-000000000000", leaveType: "ลาป่วย", name: "นายกัณฐิมา กาฬสินธ์ุ", Date: "2023-11-03", status: "NEW", }, { + id: "00000000-0000-0000-0000-000000000000", leaveType: "ลากิจส่วนตัว", name: "นายนครชัย วันดี", Date: "2023-11-01", status: "APPROVE", }, { + id: "00000000-0000-0000-0000-000000000000", leaveType: "ลากิจส่วนตัว", name: "นายกัณฐิมา กาฬสินธ์ุ", Date: "2023-11-02", status: "PENDING", }, { + id: "00000000-0000-0000-0000-000000000000", leaveType: "ลาป่วย", name: "นายปิยรมย์ ศิริธาราฟ", Date: "2023-11-01",