From f14567a0b606ece639ddf8d191310348bf73e41a Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 9 Jul 2024 12:46:38 +0700 Subject: [PATCH] fixing competency --- src/modules/08_KPI/components/Tab/Topic/02_Competency.vue | 4 +++- src/modules/08_KPI/views/form.vue | 4 ++-- src/modules/08_KPI/views/mainEvaluator.vue | 7 ++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/modules/08_KPI/components/Tab/Topic/02_Competency.vue b/src/modules/08_KPI/components/Tab/Topic/02_Competency.vue index a0a1455..665d8e0 100644 --- a/src/modules/08_KPI/components/Tab/Topic/02_Competency.vue +++ b/src/modules/08_KPI/components/Tab/Topic/02_Competency.vue @@ -271,8 +271,10 @@ function onLevel(num: number, list: any) { } const competencyType = ref([]); -onMounted(async () => { +onMounted(() => { setTimeout(async () => { + // console.log("posTypeName===>", store.dataEvaluation.posTypeName); + competencyType.value = await (store.dataEvaluation.posTypeName == "อำนวยการ" || store.dataEvaluation.posTypeName == "บริหาร" ? store.competencyType.filter( diff --git a/src/modules/08_KPI/views/form.vue b/src/modules/08_KPI/views/form.vue index 6458532..b8137c9 100644 --- a/src/modules/08_KPI/views/form.vue +++ b/src/modules/08_KPI/views/form.vue @@ -61,9 +61,9 @@ const router = useRouter(); async function fetchEvaluation() { await http .get(config.API.kpiEvaluation + `/${id.value}`) - .then(async (res) => { + .then((res) => { const data = res.data.result; - store.dataEvaluation = await data; + store.dataEvaluation = res.data.result; formProfile.status = store.convertStatus(data.evaluationStatus); formProfile.result = store.convertResults(data.evaluationResults); // store.checkCompetency(); diff --git a/src/modules/08_KPI/views/mainEvaluator.vue b/src/modules/08_KPI/views/mainEvaluator.vue index a622939..c4f0a6e 100644 --- a/src/modules/08_KPI/views/mainEvaluator.vue +++ b/src/modules/08_KPI/views/mainEvaluator.vue @@ -184,11 +184,12 @@ watch( } ); -function onChangTab() { +async function onChangTab() { store.formQuery.page = 1; - dataListMain.value = []; + dataListMain.value = await []; + store.selected = await []; + fetchList(); - store.selected = []; } onMounted(async () => {