diff --git a/src/modules/08_KPI/store.ts b/src/modules/08_KPI/store.ts index 34b82ad..b0337f2 100644 --- a/src/modules/08_KPI/store.ts +++ b/src/modules/08_KPI/store.ts @@ -4,7 +4,7 @@ import type { DataOptions } from "./interface/index/Main"; export const useKpiDataStore = defineStore("KPIDate", () => { const tabMain = ref("1"); - const dataProfile = ref(); + const dataProfile = ref(null); const dataEvaluation = ref({ plannedPoint: 0, rolePoint: 0, diff --git a/src/modules/08_KPI/views/form.vue b/src/modules/08_KPI/views/form.vue index 583456b..af6f2de 100644 --- a/src/modules/08_KPI/views/form.vue +++ b/src/modules/08_KPI/views/form.vue @@ -264,9 +264,7 @@ function onSubmitScore() { }) .then(async (res) => { await fetchEvaluation(); - await getProfile(); - await getOrgOp(); - await success($q, "บันทึกสำเร็จ"); + success($q, "บันทึกสำเร็จ"); modalScore.value = false; }) .catch((e) => { @@ -288,7 +286,7 @@ async function clearScore() { async function getAll() { await fetchEvaluation(); - await getProfile(); + await (store.dataProfile === null ? getProfile() : ""); await getOrgOp(); } diff --git a/src/modules/08_KPI/views/main.vue b/src/modules/08_KPI/views/main.vue index 4125190..287ee12 100644 --- a/src/modules/08_KPI/views/main.vue +++ b/src/modules/08_KPI/views/main.vue @@ -213,22 +213,25 @@ function onSubmit() { } function getProfile() { - showLoader(); http - .get(config.API.profileBykeycloak()) + .get(config.API.profilePosition()) .then((res) => { const data = res.data.result; - formRound.profileId = data.id; + store.dataProfile = data; + store.checkCompetency(); + store.checkCompetencyDefaultCompetencyLevel(); + + formRound.profileId = data.profileId; formRound.prefix = data.prefix; formRound.firstName = data.firstName; formRound.lastName = data.lastName; }) .catch((e) => { messageError($q, e); - }) - .finally(() => { - hideLoader(); }); + // .finally(() => { + // hideLoader(); + // }); } function checkClosed() {