Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop

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

src/modules/15_development/components/Target.vue

@@ -420,6 +420,8 @@ function onClickCloseDialog() {
   groupTargetData.targetData = [{}];
   modalRelate.value = false;
   cleanFormData();
+  fetchType();
+  fetchData(projectId.value);
 }
 
 /**
@@ -544,7 +546,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