Merge branch 'develop' into devTee

src/modules/14_KPI/views/report.vue

@@ -32,11 +32,13 @@ import DialogHeader from "@/components/DialogHeader.vue";
  */
 import { useCounterMixin } from "@/stores/mixin";
 import { checkPermission } from "@/utils/permissions";
+import { useRoute } from "vue-router";
 /**
  * use
  */
 const $q = useQuasar();
 const { showLoader, hideLoader, messageError } = useCounterMixin();
+const route = useRoute();
 
 /**
  * ตัวแปรงาน
@@ -148,7 +150,7 @@ function fetchActiveId() {
 function fetchListOrg(id: string) {
   showLoader();
   http
-    .get(config.API.orgByid(id))
+    .get(config.API.orgByIdSystem(id, route.meta.Key as string))
     .then(async (res) => {
       const data = await res.data.result.map((item: ResOrg) => ({
         id: item.orgTreeId,