Merge branch 'develop' into devTee

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";
 

src/modules/12_evaluatePersonal/components/Meeting/Form.vue

@@ -307,7 +307,7 @@ function inputEdit(val: boolean) {
             dense
             outlined
             v-model="formData.title"
-            label="ชื่อการประชุม"
+            label="หัวข้อการประชุม"
             ref="titleRef"
             for="titleRef"
             hide-bottom-space

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 {

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",