Merge branch 'NiceDev' into develop

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

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watch } from "vue";
+import { ref } from "vue";
 import { useQuasar } from "quasar";
 import config from "@/app.config";
 import http from "@/plugins/http";
@@ -13,14 +13,8 @@ import { useCounterMixin } from "@/stores/mixin";
 
 const $q = useQuasar();
 const store = useKpiDataStore();
-const {
+const { showLoader, hideLoader, messageError, dialogConfirm, success } =
-  showLoader,
+  useCounterMixin();
-  hideLoader,
-  messageError,
-  dialogConfirm,
-  dialogMessageNotify,
-  success,
-} = useCounterMixin();
 
 const modal = defineModel<boolean>("modal", { required: true });
 const rows = defineModel<any>("data", { required: true });

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

@@ -146,8 +146,8 @@ function onDelete(id: string) {
           ? config.API.kpiAchievement("special") + `/${id}`
           : "";
       await http.delete(url);
-      props.fetchList?.();
       success($q, "ลบข้อมูลสำเร็จ");
+      props.fetchList?.();
     } catch (err) {
       messageError($q, err);
     } finally {