diff --git a/src/components/PopupCheckFeatures.vue b/src/components/PopupCheckFeatures.vue
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/modules/12_evaluatePersonal/store/MeetingStore.ts b/src/modules/12_evaluatePersonal/store/MeetingStore.ts
index 340836bc3..fda29825c 100644
--- a/src/modules/12_evaluatePersonal/store/MeetingStore.ts
+++ b/src/modules/12_evaluatePersonal/store/MeetingStore.ts
@@ -1,88 +1,90 @@
 import { defineStore } from "pinia";
 import { ref } from "vue";
 import { useCounterMixin } from "@/stores/mixin";
-import type { DataResponseList, MainList } from "@/modules/12_evaluatePersonal/interface/index/meeting";
+import type {
+  DataResponseList,
+  MainList,
+} from "@/modules/12_evaluatePersonal/interface/index/meeting";
 import type { QTableProps } from "quasar";
 
 // store ระบบวินัย >> ข้อมูลพื้นฐาน >> กรรมการ
 export const useEvaluateMeetingDataStore = defineStore(
-    "evaluateMeeting",
-    () => {
-        const mixin = useCounterMixin()
-        const { date2Thai } = mixin
-        //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
-        const visibleColumns = ref<string[]>([
-            "no",
-            "round",
-            "title",
-            "date",
-        ]);
+  "evaluateMeeting",
+  () => {
+    const mixin = useCounterMixin();
+    const { date2Thai } = mixin;
+    //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
+    const visibleColumns = ref<string[]>(["no", "round", "title", "date"]);
 
-        // หัวตาราง
-        const columns = ref<QTableProps["columns"]>([
-            {
-                name: "no",
-                align: "left",
-                label: "ลำดับ",
-                sortable: false,
-                field: "no",
-                headerStyle: "font-size: 14px",
-                style: "font-size: 14px",
-            },
-            {
-                name: "round",
-                align: "left",
-                label: "ครั้งที่",
-                sortable: true,
-                field: "round",
-                headerStyle: "font-size: 14px",
-                style: "font-size: 14px",
-            },
-            {
-                name: "title",
-                align: "left",
-                label: "เรื่อง",
-                sortable: true,
-                field: "title",
-                headerStyle: "font-size: 14px",
-                style: "font-size: 14px",
-            },
-            {
-                name: "date",
-                align: "left",
-                label: "วันเวลาในการประชุม",
-                sortable: true,
-                field: "date",
-                headerStyle: "font-size: 14px",
-                style: "font-size: 14px",
-            },
-        ]);
+    // หัวตาราง
+    const columns = ref<QTableProps["columns"]>([
+      {
+        name: "no",
+        align: "left",
+        label: "ลำดับ",
+        sortable: false,
+        field: "no",
+        headerStyle: "font-size: 14px",
+        style: "font-size: 14px",
+      },
+      {
+        name: "round",
+        align: "left",
+        label: "ครั้งที่",
+        sortable: true,
+        field: "round",
+        headerStyle: "font-size: 14px",
+        style: "font-size: 14px",
+      },
+      {
+        name: "title",
+        align: "left",
+        label: "เรื่อง",
+        sortable: true,
+        field: "title",
+        headerStyle: "font-size: 14px",
+        style: "font-size: 14px",
+      },
+      {
+        name: "date",
+        align: "left",
+        label: "วันเวลาในการประชุม",
+        sortable: true,
+        field: "date",
+        headerStyle: "font-size: 14px",
+        style: "font-size: 14px",
+      },
+    ]);
 
-        // ข้อมูลในตาราง
-        const rows = ref<MainList[]>([]);
-        function fetchData(data: DataResponseList[]) {
-            const dataList: MainList[] = data.map((item: DataResponseList) => ({
-                id:item.Id,
-                createdAt:item.CreatedAt,
-                createdUserId:item.CreatedUserId,
-                lastUpdatedAt:item.LastUpdatedAt,
-                lastUpdateUserId:item.LastUpdateUserId,
-                createdFullName:item.CreatedFullName,
-                lastUpdateFullName:item.LastUpdateFullName,
-                title:item.Tittle,
-                round:item.Round,
-                date:date2Thai(item.Date as Date),
-                result:item.Result,
-                duration:item.Duration,
-            }))
-            rows.value = dataList
-        }
-
-        return {
-            visibleColumns,
-            columns,
-            rows,
-            fetchData
-        };
+    // ข้อมูลในตาราง
+    const rows = ref<any[]>([]);
+    function fetchData(data: any[]) {
+      const dataList: any[] = data.map((item: any) => ({
+        id: item.Id,
+        createdAt: item.CreatedAt,
+        createdUserId: item.CreatedUserId,
+        lastUpdatedAt: item.LastUpdatedAt,
+        lastUpdateUserId: item.LastUpdateUserId,
+        createdFullName: item.CreatedFullName,
+        lastUpdateFullName: item.LastUpdateFullName,
+        title: item.Tittle,
+        round: item.Round,
+        date: `${date2Thai(item.DateStart as Date, false, true)} - ${date2Thai(
+          item.DateEnd as Date,
+          false,
+          true
+        )}`,
+        result: item.Result,
+        duration: item.Duration,
+      }));
+      rows.value = dataList;
     }
+
+    return {
+      visibleColumns,
+      columns,
+      rows,
+      fetchData,
+    };
+  }
 );