Merge branch 'develop' into nice_dev

src/modules/11_discipline/interface/response/director.ts

@@ -6,6 +6,8 @@ interface DirectorRows {
     position: string;
     email: string;
     phone: string;
+    totalInvestigate: number
+    totalDisciplinary: number
 }
 interface DirectorRowsResponse {
     id:string
@@ -13,6 +15,8 @@ interface DirectorRowsResponse {
     position:string
     email:string
     phone:string
+    totalInvestigate: number
+    totalDisciplinary: number
 }
 
 export type {

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

@@ -14,6 +14,8 @@ export const useDisciplineDirectorDataStore = defineStore(
       "position",
       "email",
       "phone",
+      "totalInvestigate",
+      "totalDisciplinary",
     ]);
 
     // หัวตาราง
@@ -63,6 +65,24 @@ export const useDisciplineDirectorDataStore = defineStore(
         headerStyle: "font-size: 14px",
         style: "font-size: 14px",
       },
+      {
+        name: "totalInvestigate",
+        align: "left",
+        label: "จำนวนการสืบสวน",
+        sortable: true,
+        field: "totalInvestigate",
+        headerStyle: "font-size: 14px",
+        style: "font-size: 14px",
+      },
+      {
+        name: "totalDisciplinary",
+        align: "left",
+        label: "จำนวนการสอบสวน",
+        sortable: true,
+        field: "totalDisciplinary",
+        headerStyle: "font-size: 14px",
+        style: "font-size: 14px",
+      },
     ]);
 
     // ข้อมูลในตาราง
@@ -73,7 +93,9 @@ export const useDisciplineDirectorDataStore = defineStore(
         fullName:`${item.prefix}${item.firstName} ${item.lastName}`,
         position:item.position,
         email:item.email,
-        phone:item.phone
+        phone:item.phone,
+        totalInvestigate: item.totalInvestigate,
+        totalDisciplinary: item.totalDisciplinary,
       }))
       rows.value = dataList
     }