ผูก API สรุปผลการพิจารณา

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

@@ -7,7 +7,7 @@ import type {
   directorType,
   responseType,
   DataOptioGroup,
-  DataNumberOption
+  DataNumberOption,
 } from "@/modules/11_discipline/interface/index/Main";
 import { useCounterMixin } from "@/stores/mixin";
 const mixin = useCounterMixin();
@@ -32,7 +32,7 @@ export const useInvestigateDisStore = defineStore(
       { id: "NOT_SPECIFIED", name: "ยังไม่ระบุ" },
       { id: "HAVE_CAUSE", name: "มีมูล" },
       { id: "NO_CAUSE", name: "ไม่มีมูล" },
-  ]);
+    ]);
 
     const optionsfaultLevel = ref<DataOptioGroup[]>([
       { id: "0", name: "ไม่ร้ายแรง", disable: true },
@@ -357,7 +357,10 @@ export const useInvestigateDisStore = defineStore(
       daysExtendOps,
 
       filterFnOptionsType,
-      causeTextOptions
+      causeTextOptions,
+
+      convertRespondentType,
+      convertFault,
     };
   }
 );

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

@@ -6,25 +6,43 @@ import type {
   DataOption,
   directorType,
 } from "@/modules/11_discipline/interface/index/Main";
+import type {
+  DataResult,
+  DataResultList,
+} from "@/modules/11_discipline/interface/response/result";
+
+import { useStoreResultMain } from "@/modules/11_discipline/store";
 import { useCounterMixin } from "@/stores/mixin";
 const mixin = useCounterMixin();
+const storeMain = useStoreResultMain();
 const { date2Thai } = mixin;
 
 export const useDisciplineResultStore = defineStore(
   "disciplineResultStore",
   () => {
     const tabMenu = ref<string>("result");
-    const rows = ref<investigateDisDataRowType[]>([]);
+    const rows = ref<DataResultList[]>([]);
     const rows2 = ref<directorType[]>([]);
     const selected = ref<directorType[]>([]);
 
-    async function fecthList(data: investigateDisDataRowType[]) {
-      let datalist: investigateDisDataRowType[] = data.map((e: any) => ({
+    async function fetchList(data: DataResult[]) {
+      const datalist: DataResultList[] = data.map((e: DataResult) => ({
         id: e.id,
-        subject: e.subject,
-        interrogated: e.interrogated,
-        caseFault: e.caseFault,
-        dateInvestigate: date2Thai(new Date(e.dateInvestigate)),
+        title: e.title,
+        respondentType: e.respondentType
+          ? storeMain.convertRespondentType(e.respondentType)
+          : "-",
+        offenseDetails: e.offenseDetails
+          ? storeMain.convertFault(e.offenseDetails)
+          : "-",
+        disciplinaryFaultLevel: e.disciplinaryFaultLevel
+          ? e.disciplinaryFaultLevel
+          : "-",
+        disciplinaryCaseFault: e.disciplinaryCaseFault
+          ? e.disciplinaryCaseFault
+          : "-",
+        status: e.status && storeMain.convertStatus(e.status),
+        createdAt: e.createdAt && date2Thai(e.createdAt),
       }));
       rows.value = datalist;
     }
@@ -45,12 +63,12 @@ export const useDisciplineResultStore = defineStore(
 
     const visibleColumns = ref<String[]>([
       "no",
-      "subject",
-      "interrogated",
-      "fault",
-      "penaltyLevel",
-      "caseFault",
-      "dateInvestigate",
+      "title",
+      "respondentType",
+      "offenseDetails",
+      "disciplinaryFaultLevel",
+      "disciplinaryCaseFault",
+      "createdAt",
       "status",
     ]);
 
@@ -65,64 +83,64 @@ export const useDisciplineResultStore = defineStore(
         style: "font-size: 14px",
       },
       {
-        name: "subject",
+        name: "title",
         align: "left",
         label: "เรื่อง",
         sortable: true,
-        field: "subject",
+        field: "title",
         headerStyle: "font-size: 14px",
         style: "font-size: 14px",
       },
       {
-        name: "interrogated",
+        name: "respondentType",
         align: "left",
         label: "ผู้ถูกสืบสวน",
         sortable: true,
-        field: "interrogated",
+        field: "respondentType",
         headerStyle: "font-size: 14px",
         style: "font-size: 14px",
         sort: (a: string, b: string) =>
           a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
       },
       {
-        name: "fault",
+        name: "offenseDetails",
         align: "left",
         label: "ลักษณะความผิด",
         sortable: true,
-        field: "fault",
+        field: "offenseDetails",
         headerStyle: "font-size: 14px",
         style: "font-size: 14px",
         sort: (a: string, b: string) =>
           a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
       },
       {
-        name: "penaltyLevel",
+        name: "disciplinaryFaultLevel",
         align: "left",
         label: "ระดับโทษความผิด",
         sortable: true,
-        field: "penaltyLevel",
+        field: "disciplinaryFaultLevel",
         headerStyle: "font-size: 14px",
         style: "font-size: 14px",
         sort: (a: string, b: string) =>
           a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
       },
       {
-        name: "caseFault",
+        name: "disciplinaryCaseFault",
         align: "left",
         label: "กรณีความผิด",
         sortable: true,
-        field: "caseFault",
+        field: "disciplinaryCaseFault",
         headerStyle: "font-size: 14px",
         style: "font-size: 14px",
         sort: (a: string, b: string) =>
           a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
       },
       {
-        name: "dateInvestigate",
+        name: "createdAt",
         align: "left",
         label: "วันที่สอบสวน",
         sortable: true,
-        field: "dateInvestigate",
+        field: "createdAt",
         headerStyle: "font-size: 14px",
         style: "font-size: 14px",
       },
@@ -213,7 +231,7 @@ export const useDisciplineResultStore = defineStore(
     ]);
     return {
       tabMenu,
-      fecthList,
+      fetchList,
       rows,
       rows2,
       fecthDirector,