From a3154508d0cf937ea772db0d2e670c4f325d2302 Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Wed, 3 Jul 2024 14:02:37 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=81=E0=B8=B2=E0=B8=A3?=
 =?UTF-8?q?/=E0=B8=AB=E0=B8=A5=E0=B8=B1=E0=B8=81=E0=B8=AA=E0=B8=B9?=
 =?UTF-8?q?=E0=B8=95=E0=B8=A3=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9D=E0=B8=B6?=
 =?UTF-8?q?=E0=B8=81=E0=B8=AD=E0=B8=9A=E0=B8=A3=E0=B8=A1=20=E0=B8=9B?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=94dialog=20=E0=B9=80=E0=B9=80=E0=B8=A5=E0=B9=89?=
 =?UTF-8?q?=E0=B8=A7=20=E0=B8=94=E0=B8=B6=E0=B8=87=E0=B8=82=E0=B9=89?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=81=E0=B8=A5=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=A1=E0=B8=B2=20=E0=B8=96=E0=B9=89=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=B5=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=80=E0=B9=80?=
 =?UTF-8?q?=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82=E0=B9=80=E0=B9=80=E0=B8=95?=
 =?UTF-8?q?=E0=B9=88=E0=B9=84=E0=B8=A1=E0=B9=88=20=E0=B8=9A=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=99=E0=B8=97=E0=B8=B6=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/14_KPI/components/Tab/Topic/02_Competency.vue | 4 ++--
 src/modules/15_development/components/Target.vue          | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/modules/14_KPI/components/Tab/Topic/02_Competency.vue b/src/modules/14_KPI/components/Tab/Topic/02_Competency.vue
index 1dcad6a59..6e1e753d8 100644
--- a/src/modules/14_KPI/components/Tab/Topic/02_Competency.vue
+++ b/src/modules/14_KPI/components/Tab/Topic/02_Competency.vue
@@ -136,7 +136,7 @@ function getData(type: any) {
     .then(async (res) => {
       const data = res.data.result.data;
       rows.value[type] = data;
-      lists.value = await lists.value.filter((x: any) => x.type != type);
+      lists.value = lists.value.filter((x: any) => x.type != type);
       lists.value.push({ type: type, data });
     })
     .catch((e) => {
@@ -349,7 +349,7 @@ onMounted(() => {
         <d-table
           ref="table"
           :columns="columns"
-          :rows="rows[item.id]"
+          :rows="rows.length !== 0 ? rows[item.id]:[]"
           row-key="id"
           flat
           bordered
diff --git a/src/modules/15_development/components/Target.vue b/src/modules/15_development/components/Target.vue
index 8d01b5644..5456cf4db 100644
--- a/src/modules/15_development/components/Target.vue
+++ b/src/modules/15_development/components/Target.vue
@@ -409,6 +409,8 @@ function onClickCloseDialog() {
   groupTargetData.targetData = [{}];
   modalRelate.value = false;
   cleanFormData();
+  fetchType();
+  fetchData(projectId.value);
 }
 
 /**
@@ -533,7 +535,7 @@ onMounted(() => {
             </q-tr>
           </template>
           <template v-slot:body="props">
-            <q-tr :props="props" class="cursor-pointer">
+            <q-tr :props="props" class="cursor-pointer vertical-top">
               <q-td v-for="col in props.cols" :key="col.name" :props="props">
                 <div v-if="col.name === 'posTypePlannedId'">
                   <div