Merge branch 'NiceDev' into develop

src/modules/08_KPI/components/Tab/Topic/01_Indicator.vue

@@ -115,10 +115,10 @@ const columns = ref<QTableProps["columns"]>([
 ]);
 
 function onAdd(edit: boolean = false, id: string = "") {
+  isStatusEdit.value = edit;
+  kpiUserPlannedId.value = id;
   if (numpage.value !== 3) {
     modal.value = true;
-    isStatusEdit.value = edit;
-    kpiUserPlannedId.value = id;
   } else if (numpage.value == 3) {
     modalAssigned.value = true;
   }
@@ -131,7 +131,11 @@ function onDelete(id: string) {
       const url =
         numpage.value === 1
           ? config.API.kpiAchievement("planned") + `/${id}`
-          : config.API.kpiAchievement("role") + `/${id}`;
+          : numpage.value === 2
+          ? config.API.kpiAchievement("role") + `/${id}`
+          : numpage.value === 3
+          ? config.API.kpiAchievement("role") + `/${id}`
+          : "";
       await http.delete(url);
       props.fetchList?.();
       success($q, "ลบข้อมูลสำเร็จ");
@@ -242,7 +246,12 @@ watch(
     :isStatusEdit="isStatusEdit"
     :kpiUserPlannedId="kpiUserPlannedId"
   />
-  <Dialog03 v-model:modal="modalAssigned" :numpage="numpage" />
+  <Dialog03
+    v-model:modal="modalAssigned"
+    :numpage="numpage"
+    :isStatusEdit="isStatusEdit"
+    :kpiUserPlannedId="kpiUserPlannedId"
+  />
 </template>
 <style scoped>
 .custom-table2 {