From 0ebce96c89b6036dfb5011e5ba1b660397f6e05c Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Wed, 24 Jan 2024 09:50:20 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=A5=E0=B8=B0=E0=B9=80=E0=B8=AD=E0=B8=B5?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=94=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9B=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B0=E0=B9=80=E0=B8=A1=E0=B8=B4=E0=B8=99=E0=B8=9A=E0=B8=B8?=
 =?UTF-8?q?=E0=B8=84=E0=B8=84=E0=B8=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Detail/viewTab2/CardDirector.vue          |  7 ++--
 .../components/Detail/viewTab2/CardMeet.vue   | 32 ++++++++++++++++---
 .../components/Detail/viewTab2/DialogMeet.vue | 22 +++++++++++++
 3 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue
index f51111b64..03f234f61 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue
@@ -93,10 +93,12 @@ const listDirector = ref<any>([]);
 
 async function onClickAdd() {
   modalAddDirector.value = true;
+  getList()
 }
 
 function onClickClose() {
   modalAddDirector.value = false;
+  props.fetchdata()
 }
 
 /**
@@ -128,7 +130,6 @@ function returnDirector(data: any) {
         messageError($q, e);
       })
       .finally(() => {
-        props.fetchdata();
         onClickClose();
         hideLoader();
       });
@@ -166,7 +167,6 @@ async function getList() {
       hideLoader();
     });
 }
-
 watch(
   () => props.data,
   () => {
@@ -186,9 +186,6 @@ watch(
   }
 );
 
-onMounted(() => {
-  getList();
-});
 </script>
 
 <template>
diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardMeet.vue b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardMeet.vue
index af7744a06..4f6d71638 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardMeet.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardMeet.vue
@@ -62,6 +62,28 @@ const columns = ref<QTableProps["columns"]>([
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
+  {
+    name: "tittle",
+    align: "left",
+    label: "หัวข้อการประชุม",
+    sortable: true,
+    field: "tittle",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "round",
+    align: "left",
+    label: "ครั้งที่",
+    sortable: true,
+    field: "round",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
   {
     name: "result",
     align: "left",
@@ -97,10 +119,12 @@ const listMeet = ref<any>([]);
 
 function onClickAdd() {
   modalAdd.value = true;
+  getList()
 }
 
 function onClickClose() {
   modalAdd.value = false;
+  props.fetchdata()
 }
 
 /**
@@ -132,7 +156,6 @@ function returnData(data: any) {
         messageError($q, e);
       })
       .finally(() => {
-        props.fetchdata();
         onClickClose();
         hideLoader();
       });
@@ -154,7 +177,7 @@ async function getList() {
         lastUpdateUserId: item.lastUpdateUserId,
         createdFullName: item.createdFullName,
         lastUpdateFullName: item.lastUpdateFullName,
-        title: item.tittle,
+        tittle: item.tittle,
         round: item.round,
         date: `${date2Thai(item.dateStart as Date, false, true)} - ${date2Thai(
           item.dateEnd as Date,
@@ -185,6 +208,8 @@ watch(
           true
         )}`,
         dateStart: item.dateStart,
+        tittle: item.tittle ? item.tittle : '-',
+        round: item.round ? item.round : '-',
         dateEnd: item.dateEnd,
         result: item.result,
         timePeriod: item.duration,
@@ -193,9 +218,6 @@ watch(
   }
 );
 
-onMounted(async () => {
-  await getList();
-});
 </script>
 <template>
   <q-card bordered class="row col-12" style="border: 1px solid #d6dee1">
diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/DialogMeet.vue b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/DialogMeet.vue
index b2b03e2c5..d5766f781 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/DialogMeet.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/DialogMeet.vue
@@ -76,6 +76,28 @@ const columns = ref<QTableProps["columns"]>([
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
+  {
+    name: "tittle",
+    align: "left",
+    label: "หัวข้อการประชุม",
+    sortable: true,
+    field: "tittle",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "round",
+    align: "left",
+    label: "ครั้งที่",
+    sortable: true,
+    field: "round",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
   {
     name: "result",
     align: "left",