From 58c2bfc4676c7cb42412dfcd71bb121311b6688d Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Fri, 19 Jan 2024 10:22:11 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=9C?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A1=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Meeting/Form.vue               |   4 +-
 .../store/DirectorStore.ts                    | 181 +++++++++---------
 2 files changed, 94 insertions(+), 91 deletions(-)

diff --git a/src/modules/12_evaluatePersonal/components/Meeting/Form.vue b/src/modules/12_evaluatePersonal/components/Meeting/Form.vue
index 2645ca1d8..9715ce84e 100644
--- a/src/modules/12_evaluatePersonal/components/Meeting/Form.vue
+++ b/src/modules/12_evaluatePersonal/components/Meeting/Form.vue
@@ -283,8 +283,8 @@ onMounted(() => {
                     : null
                 "
                 hide-bottom-space
-                :label="`${'วันเวลาที่เริ่มต้นการประชุม'}`"
-                :rules="[(val: string) => !!val || `${'กรุณาเลือกวันเวลาที่เริ่มต้นการประชุม'}`]"
+                :label="`${'วันเวลาเริ่มต้นการประชุม'}`"
+                :rules="[(val: string) => !!val || `${'กรุณาเลือกวันเวลาเริ่มต้นการประชุม'}`]"
               >
                 <template v-slot:prepend>
                   <q-icon name="event" class="cursor-pointer text-primary">
diff --git a/src/modules/12_evaluatePersonal/store/DirectorStore.ts b/src/modules/12_evaluatePersonal/store/DirectorStore.ts
index e3d0e0760..05ca1cc97 100644
--- a/src/modules/12_evaluatePersonal/store/DirectorStore.ts
+++ b/src/modules/12_evaluatePersonal/store/DirectorStore.ts
@@ -1,101 +1,104 @@
 import { defineStore } from "pinia";
 import { ref } from "vue";
 import { useCounterMixin } from "@/stores/mixin";
-import type { DataResponseList, MainList } from "@/modules/12_evaluatePersonal/interface/index/director";
+import type {
+  DataResponseList,
+  MainList,
+} from "@/modules/12_evaluatePersonal/interface/index/director";
 import type { QTableProps } from "quasar";
 
 // store ระบบวินัย >> ข้อมูลพื้นฐาน >> กรรมการ
 export const useEvaluateDirectorDataStore = defineStore(
-    "evaluateDirector",
-    () => {
-        const mixin = useCounterMixin()
-        const { date2Thai } = mixin
-        //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
-        const visibleColumns = ref<string[]>([
-            "no",
-            "name",
-            "position",
-            "email",
-            "phone",
-          ]);
-      
-          // หัวตาราง
-          const columns = ref<QTableProps["columns"]>([
-            {
-              name: "no",
-              align: "left",
-              label: "ลำดับ",
-              sortable: false,
-              field: "no",
-              headerStyle: "font-size: 14px",
-              style: "font-size: 14px",
-            },
-            {
-              name: "name",
-              align: "left",
-              label: "ชื่อ-นามสกุล",
-              sortable: true,
-              field: "name",
-              headerStyle: "font-size: 14px",
-              style: "font-size: 14px",
-            },
-            {
-              name: "position",
-              align: "left",
-              label: "ตำแหน่ง",
-              sortable: true,
-              field: "position",
-              headerStyle: "font-size: 14px",
-              style: "font-size: 14px",
-            },
-            {
-              name: "email",
-              align: "left",
-              label: "อีเมล",
-              sortable: true,
-              field: "email",
-              headerStyle: "font-size: 14px",
-              style: "font-size: 14px",
-            },
-            {
-              name: "phone",
-              align: "left",
-              label: "เบอร์โทรศัพท์",
-              sortable: true,
-              field: "phone",
-              headerStyle: "font-size: 14px",
-              style: "font-size: 14px",
-            },
-          ]);
+  "evaluateDirector",
+  () => {
+    const mixin = useCounterMixin();
+    const { date2Thai } = mixin;
+    //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
+    const visibleColumns = ref<string[]>([
+      "no",
+      "name",
+      "position",
+      "email",
+      "phone",
+    ]);
 
-        // ข้อมูลในตาราง
-        const rows = ref<MainList[]>([]);
-        function fetchData(data: DataResponseList[]) {
-            const dataList: MainList[] = data.map((item: DataResponseList) => ({
-                id:item.id,
-                name:`${item.prefix}${item.firstName} ${item.lastName}`,
-                prefix:item.prefix,
-                firstName:item.firstName,
-                lastName:item.lastName,
-                phone:item.phone,
-                email:item.email,
-                position:item.position,
+    // หัวตาราง
+    const columns = ref<QTableProps["columns"]>([
+      {
+        name: "no",
+        align: "left",
+        label: "ลำดับ",
+        sortable: false,
+        field: "no",
+        headerStyle: "font-size: 14px",
+        style: "font-size: 14px",
+      },
+      {
+        name: "name",
+        align: "left",
+        label: "ชื่อ-นามสกุล",
+        sortable: true,
+        field: "name",
+        headerStyle: "font-size: 14px",
+        style: "font-size: 14px",
+      },
+      {
+        name: "position",
+        align: "left",
+        label: "ตำแหน่ง",
+        sortable: true,
+        field: "position",
+        headerStyle: "font-size: 14px",
+        style: "font-size: 14px",
+      },
+      {
+        name: "email",
+        align: "left",
+        label: "อีเมล",
+        sortable: true,
+        field: "email",
+        headerStyle: "font-size: 14px",
+        style: "font-size: 14px",
+      },
+      {
+        name: "phone",
+        align: "left",
+        label: "เบอร์โทรศัพท์",
+        sortable: true,
+        field: "phone",
+        headerStyle: "font-size: 14px",
+        style: "font-size: 14px",
+      },
+    ]);
 
-                createdFullName:item.createdFullName,
-                lastUpdateFullName:item.lastUpdateFullName,
-                createdUserId:item.createdUserId,
-                lastUpdateUserId:item.lastUpdateUserId,
-                createdAt:item.createdAt,
-                lastUpdatedAt:item.lastUpdatedAt,
-            }))
-            rows.value = dataList
-        }
+    // ข้อมูลในตาราง
+    const rows = ref<MainList[]>([]);
+    function fetchData(data: DataResponseList[]) {
+      const dataList: MainList[] = data.map((item: DataResponseList) => ({
+        id: item.id,
+        name: `${item.prefix}${item.firstName} ${item.lastName}`,
+        prefix: item.prefix,
+        firstName: item.firstName,
+        lastName: item.lastName,
+        phone: item.phone ? item.phone : "-",
+        email: item.email ? item.email : "-",
+        position: item.position ? item.position : "-",
 
-        return {
-            visibleColumns,
-            columns,
-            rows,
-            fetchData
-        };
+        createdFullName: item.createdFullName,
+        lastUpdateFullName: item.lastUpdateFullName,
+        createdUserId: item.createdUserId,
+        lastUpdateUserId: item.lastUpdateUserId,
+        createdAt: item.createdAt,
+        lastUpdatedAt: item.lastUpdatedAt,
+      }));
+      rows.value = dataList;
     }
+
+    return {
+      visibleColumns,
+      columns,
+      rows,
+      fetchData,
+    };
+  }
 );