Merge branch 'develop' into devTee

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,

src/modules/12_evaluatePersonal/store/MeetingStore.ts

@@ -39,7 +39,7 @@ export const useEvaluateMeetingDataStore = defineStore(
       {
         name: "title",
         align: "left",
-        label: "เรื่อง",
+        label: "หัวข้อการประชุม",
         sortable: true,
         field: "title",
         headerStyle: "font-size: 14px",