diff --git a/src/modules/01_masterdata/components/Indicators/Summary.vue b/src/modules/01_masterdata/components/Indicators/Summary.vue new file mode 100644 index 000000000..856abde1b --- /dev/null +++ b/src/modules/01_masterdata/components/Indicators/Summary.vue @@ -0,0 +1,76 @@ + + diff --git a/src/modules/01_masterdata/views/Assignment.vue b/src/modules/01_masterdata/views/Assignment.vue index abd2ab0c7..4a570c312 100644 --- a/src/modules/01_masterdata/views/Assignment.vue +++ b/src/modules/01_masterdata/views/Assignment.vue @@ -13,6 +13,7 @@ import type { } from "@/modules/01_masterdata/interface/index/Main"; import type { FormFilterAssignment } from "@/modules/01_masterdata/interface/request/Main"; import type { ResAssignment } from "@/modules/01_masterdata/interface/response/Main"; +import IndicatorTotal from "@/modules/01_masterdata/components/Indicators/Summary.vue"; /** importStore*/ import { useCounterMixin } from "@/stores/mixin"; @@ -176,29 +177,7 @@ onMounted(() => {
- -
-
-
-
- {{ i.label }} - - -
-
-
-
-
+
diff --git a/src/modules/01_masterdata/views/competency.vue b/src/modules/01_masterdata/views/competency.vue index 5de236eda..8534ab629 100644 --- a/src/modules/01_masterdata/views/competency.vue +++ b/src/modules/01_masterdata/views/competency.vue @@ -103,7 +103,7 @@ onMounted(() => { class="bg-white rounded-borders q-pa-sm" style="border: 1px solid #ededed" > -
+
{{ i.label }} ([]); const filterMain = ref(""); const visibleColumns = ref(["including", "includingName"]); -const indicatorTotal = ref([ - { - value: "kpiPlan", - label: "ตัวชี้วัดตามแผน", - color: "edit", - }, - { - value: "kpiRole", - label: "ตัวชี้วัดตามตำแหน่ง", - color: "primary", - }, - { - value: "kpiSpecial", - label: "ตัวชี้วัดงานอื่นๆ ที่ได้รับมอบหมาย", - color: "blue", - }, - { - value: "total", - label: "ทั้งหมด", - color: "red", - }, -]); const roundOp = ref([ { id: "", name: "ทั้งหมด" }, { id: "APR", name: "รอบเมษายน" }, @@ -217,26 +196,7 @@ function onClickHistory(id: string) { }); } -function getTotal() { - http - .post(config.API.indicatorSummary) - .then((res) => { - const data = res.data.result; - indicatorTotal.value = indicatorTotal.value.map((indicator) => { - return { - ...indicator, - total: data[indicator.value], - }; - }); - }) - .catch((e) => { - messageError($q, e); - }) - .finally(() => {}); -} - onMounted(() => { - getTotal(); fetchActive(); }); @@ -308,29 +268,7 @@ onMounted(() => {
- -
-
-
-
- {{ i.label }} - - -
-
-
-
-
+
{ รายการตัวชี้วัดตามตำแหน่ง
-
-
- -
-
-
-
- {{ i.label }} - - -
-
-
-
-
-
+
+
-