แก้ออกคำสั่งวินัย

src/modules/09_leave/components/2_Leave/TableList.vue

@@ -35,6 +35,14 @@ const columnsLeave = ref<QTableProps["columns"]>([
     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",
@@ -44,6 +52,42 @@ const columnsLeave = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "agency",
+    align: "left",
+    label: "หน่วยงาน",
+    sortable: true,
+    field: "agency",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "org",
+    align: "left",
+    label: "ส่วนราชการ",
+    sortable: true,
+    field: "org",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "position",
+    align: "left",
+    label: "ตำแหน่ง",
+    sortable: true,
+    field: "position",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "level",
+    align: "left",
+    label: "ระดับ",
+    sortable: true,
+    field: "level",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "dateSendLeave",
     align: "left",
@@ -53,6 +97,15 @@ const columnsLeave = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "dateLeave",
+    align: "left",
+    label: "วันที่ลา",
+    sortable: true,
+    field: "dateLeave",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "status",
     align: "left",
@@ -66,8 +119,14 @@ const columnsLeave = ref<QTableProps["columns"]>([
 const visibleColumnsLeave = ref<string[]>([
   "no",
   "leaveTypeName",
+  "citizenId",
   "fullName",
   "dateSendLeave",
+  "dateLeave",
+  "agency",
+  "org",
+  "position",
+  "level",
   "status",
 ]);
 

src/modules/09_leave/interface/response/leave.ts

@@ -13,6 +13,13 @@ interface ListLeave {
   fullName: string; //คำนำหน้า ชื่อ นามสกุล คนขอลา
   dateSendLeave: Date | null; //วันที่ยื่นใบลา
   status: string | null; //ส
+  citizenId?: string;
+  leaveStartDate?: Date | null;
+  leaveEndDate?: Date | null;
+  agency?: string;
+  org?: string;
+  position?: string;
+  level?: string;
 }
 interface FormData {
   id: string;

src/modules/09_leave/stores/LeaveStore.ts

@@ -45,8 +45,16 @@ export const useLeavelistDataStore = defineStore("leave", () => {
       id: e.id,
       leaveTypeName: e.leaveTypeName,
       leaveTypeId: e.leaveTypeId,
+      citizenId: e.citizenId ?? "3120101734950",
       fullName: e.fullName,
+      agency: e.agency ?? "สำนักงานการเจ้าหน้าที่",
+      org: e.org ?? "กองบริหารทั่วไป/ฝ่ายการเจ้าหน้าที่",
+      position: e.position ?? "นักทรัพยากรบุคคล",
+      level: e.level ?? "ชำนาญการ",
       dateSendLeave: e.dateSendLeave && date2Thai(e.dateSendLeave),
+      dateLeave:
+        e.dateSendLeave &&
+        date2Thai(e.dateSendLeave) + "-" + date2Thai(e.dateSendLeave),
       status: e.status && convertSatatus(e.status),
     }));