ปรับวินัย

src/modules/11_discipline/store/InvestigateDisStore.ts

@@ -80,6 +80,7 @@ export const useInvestigateDisStore = defineStore(
       "offenseDetails",
       "disciplinaryFaultLevel",
       "disciplinaryCaseFault",
+      "disciplinaryDate",
       "createdAt",
       "status",
     ]);
@@ -148,10 +149,19 @@ export const useInvestigateDisStore = defineStore(
           a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
       },
       {
-        name: "createdAt",
+        name: "disciplinaryDate",
         align: "left",
         label: "วันที่สอบสวน",
         sortable: true,
+        field: "disciplinaryDate",
+        headerStyle: "font-size: 14px",
+        style: "font-size: 14px",
+      },
+      {
+        name: "createdAt",
+        align: "left",
+        label: "วันที่รับเรื่อง",
+        sortable: true,
         field: "createdAt",
         headerStyle: "font-size: 14px",
         style: "font-size: 14px",
@@ -217,7 +227,7 @@ export const useInvestigateDisStore = defineStore(
       {
         name: "commandNo",
         align: "left",
-        label: "มติ",
+        label: "มติ/คำสั่ง",
         sortable: true,
         field: "commandNo",
         headerStyle: "font-size: 14px",
@@ -251,11 +261,12 @@ export const useInvestigateDisStore = defineStore(
     async function fetchList(data: investigateDisDataRowType[]) {
       let datalist: any[] = data.map((e: any) => ({
         id: e.id,
-        title: e.title ? e.title :'-',
-        respondentType: e.respondentType ? convertRespondentType(e.respondentType):'-',
-        offenseDetails: e.offenseDetails ? convertFault(e.offenseDetails):'-',
+        title: e.title ? e.title : '-',
+        respondentType: e.respondentType ? convertRespondentType(e.respondentType) : '-',
+        offenseDetails: e.offenseDetails ? convertFault(e.offenseDetails) : '-',
         disciplinaryFaultLevel: e.disciplinaryFaultLevel ?? "-",
         disciplinaryCaseFault: e.disciplinaryCaseFault ?? "-",
+        disciplinaryDate: e.disciplinaryDateStart && e.disciplinaryDateEnd ? `${date2Thai(e.disciplinaryDateStart)} - ${date2Thai(e.disciplinaryDateEnd)}` : '-',
         status: convertStatus(e.status) ?? "-",
         createdAt: e.createdAt ? date2Thai(e.createdAt) : "-",
       }));