From 289397c1d9bc5cb1b71f12eae741735692154115 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Thu, 21 Dec 2023 10:42:25 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=81=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=A1=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=83=E0=B8=99?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A1=E0=B8=B4=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../11_discipline/store/DirectorStore.ts      | 29 +++++++++++--------
 .../components/Director/MainPage.vue          |  1 +
 .../interface/index/director.ts               |  6 ----
 .../store/DirectorStore.ts                    | 22 --------------
 4 files changed, 18 insertions(+), 40 deletions(-)

diff --git a/src/modules/11_discipline/store/DirectorStore.ts b/src/modules/11_discipline/store/DirectorStore.ts
index 45d87feb6..9f0fd466a 100644
--- a/src/modules/11_discipline/store/DirectorStore.ts
+++ b/src/modules/11_discipline/store/DirectorStore.ts
@@ -1,6 +1,9 @@
 import { defineStore } from "pinia";
 import { ref } from "vue";
-import type { DirectorRows,DirectorRowsResponse } from "@/modules/11_discipline/interface/response/director";
+import type {
+  DirectorRows,
+  DirectorRowsResponse,
+} from "@/modules/11_discipline/interface/response/director";
 import type { QTableProps } from "quasar";
 
 // store ระบบวินัย >> ข้อมูลพื้นฐาน >> กรรมการ
@@ -88,23 +91,25 @@ export const useDisciplineDirectorDataStore = defineStore(
     // ข้อมูลในตาราง
     const rows = ref<DirectorRowsResponse[]>([]);
     function fetchData(data: DirectorRows[]) {
-      const dataList:DirectorRowsResponse[] = data.map((item:DirectorRows)=>({
-        id:item.id,
-        fullName:`${item.prefix}${item.firstName} ${item.lastName}`,
-        position:item.position,
-        email:item.email,
-        phone:item.phone,
-        totalInvestigate: item.totalInvestigate,
-        totalDisciplinary: item.totalDisciplinary,
-      }))
-      rows.value = dataList
+      const dataList: DirectorRowsResponse[] = data.map(
+        (item: DirectorRows) => ({
+          id: item.id,
+          fullName: `${item.prefix}${item.firstName} ${item.lastName}`,
+          position: item.position,
+          email: item.email,
+          phone: item.phone,
+          totalInvestigate: item.totalInvestigate,
+          totalDisciplinary: item.totalDisciplinary,
+        })
+      );
+      rows.value = dataList;
     }
 
     return {
       visibleColumns,
       columns,
       rows,
-      fetchData
+      fetchData,
     };
   }
 );
diff --git a/src/modules/12_evaluatePersonal/components/Director/MainPage.vue b/src/modules/12_evaluatePersonal/components/Director/MainPage.vue
index 1b6a2df53..e8ee8e382 100644
--- a/src/modules/12_evaluatePersonal/components/Director/MainPage.vue
+++ b/src/modules/12_evaluatePersonal/components/Director/MainPage.vue
@@ -5,6 +5,7 @@ import router from "@/router";
 import { useCounterMixin } from "@/stores/mixin";
 import { useQuasar } from "quasar";
 import { useEvaluateDirectorDataStore } from "@/modules/12_evaluatePersonal/store/DirectorStore";
+
 import http from "@/plugins/http";
 import config from "@/app.config";
 
diff --git a/src/modules/12_evaluatePersonal/interface/index/director.ts b/src/modules/12_evaluatePersonal/interface/index/director.ts
index ff007d293..773be37bb 100644
--- a/src/modules/12_evaluatePersonal/interface/index/director.ts
+++ b/src/modules/12_evaluatePersonal/interface/index/director.ts
@@ -12,9 +12,6 @@ interface DataResponseList {
     Phone:string
     Email:string
     Position:string
-
-    totalInvestigate?:number
-    totalDisciplinary?:number
 }
 
 interface MainList {
@@ -32,9 +29,6 @@ interface MainList {
     lastUpdateUserId:string
     createdAt:string
     lastUpdatedAt:string
-
-    totalInvestigate:string|number
-    totalDisciplinary:string|number
 }
 
 interface FormData {
diff --git a/src/modules/12_evaluatePersonal/store/DirectorStore.ts b/src/modules/12_evaluatePersonal/store/DirectorStore.ts
index 25278aba3..70d2e2acb 100644
--- a/src/modules/12_evaluatePersonal/store/DirectorStore.ts
+++ b/src/modules/12_evaluatePersonal/store/DirectorStore.ts
@@ -17,8 +17,6 @@ export const useEvaluateDirectorDataStore = defineStore(
             "position",
             "email",
             "phone",
-            "totalInvestigate",
-            "totalDisciplinary",
           ]);
       
           // หัวตาราง
@@ -68,24 +66,6 @@ export const useEvaluateDirectorDataStore = 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",
-            },
           ]);
 
         // ข้อมูลในตาราง
@@ -100,8 +80,6 @@ export const useEvaluateDirectorDataStore = defineStore(
                 phone:item.Phone,
                 email:item.Email,
                 position:item.Position,
-                totalInvestigate:item.totalInvestigate ? item.totalInvestigate :'-', 
-                totalDisciplinary:item.totalDisciplinary ? item.totalDisciplinary :'-', 
 
                 createdFullName:item.CreatedFullName,
                 lastUpdateFullName:item.LastUpdateFullName,