diff --git a/src/modules/09_leave/components/05_Leave/TableList.vue b/src/modules/09_leave/components/05_Leave/TableList.vue index 65a8a2c3c..bc8ffe0a7 100644 --- a/src/modules/09_leave/components/05_Leave/TableList.vue +++ b/src/modules/09_leave/components/05_Leave/TableList.vue @@ -42,14 +42,14 @@ const columnsLeave = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, - // { - // name: "citizenId", - // align: "left", - // label: "เลขประจำตัวประชาชน", - // field: "citizenId", - // headerStyle: "font-size: 14px", - // style: "font-size: 14px", - // }, + { + name: "citizenId", + align: "left", + label: "เลขประจำตัวประชาชน", + field: "citizenId", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, { name: "fullName", align: "left", @@ -113,15 +113,6 @@ const columnsLeave = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, - { - name: "leaveTotal", - align: "left", - label: "จำนวนวันที่ลา", - sortable: true, - field: "leaveTotal", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, { name: "status", align: "left", @@ -143,7 +134,6 @@ const visibleColumnsLeave = ref([ "org", "position", "level", - "leaveTotal", "status", ]); diff --git a/src/modules/09_leave/interface/response/leave.ts b/src/modules/09_leave/interface/response/leave.ts index 8ad8f42f4..8a274b6dd 100644 --- a/src/modules/09_leave/interface/response/leave.ts +++ b/src/modules/09_leave/interface/response/leave.ts @@ -25,7 +25,6 @@ interface ListLeave { position?: string; level?: string; hajjDayStatus?: boolean; - leaveTotal: number; //จำนวนวันที่ลา } interface FormData { id: string; diff --git a/src/modules/09_leave/stores/LeaveStore.ts b/src/modules/09_leave/stores/LeaveStore.ts index 6c0665db3..9bf2d6f30 100644 --- a/src/modules/09_leave/stores/LeaveStore.ts +++ b/src/modules/09_leave/stores/LeaveStore.ts @@ -88,7 +88,6 @@ export const useLeavelistDataStore = defineStore("leave", () => { : "-", status: e.status && convertSatatus(e.status), statusText: e.status, - leaveTotal: e.leaveTotal, })); mainData.value = datalist; rows.value = mainData.value;