From 6c03e24518402a2585702adadc85a396f5745afd Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Thu, 16 May 2024 16:15:57 +0700 Subject: [PATCH] updated kpi --- .../components/Evaluator/02_TabOther.vue | 2 +- .../08_KPI/components/Tab/01_Assessment.vue | 6 +- .../Tab/Dialog/DialogCommentProblem.vue | 2 +- .../Tab/Dialog/DialogCommentProgress.vue | 1 + src/modules/08_KPI/store.ts | 3 + src/modules/08_KPI/views/form.vue | 82 +++++++++++++++---- src/modules/08_KPI/views/main.vue | 38 ++++----- src/modules/08_KPI/views/mainEvaluator.vue | 26 +++++- 8 files changed, 114 insertions(+), 46 deletions(-) diff --git a/src/modules/08_KPI/components/Evaluator/02_TabOther.vue b/src/modules/08_KPI/components/Evaluator/02_TabOther.vue index 5e0e98c..772f2f1 100644 --- a/src/modules/08_KPI/components/Evaluator/02_TabOther.vue +++ b/src/modules/08_KPI/components/Evaluator/02_TabOther.vue @@ -72,7 +72,7 @@ function onClickApprove(type: string = "") { ? "DONE" : store.tabMainevaluator === "4" ? "EVALUATING" - : store.tabMainevaluator === "5" + : store.tabMainevaluator === "5" || store.tabMainevaluator === "6" ? type : undefined, id: userIds, diff --git a/src/modules/08_KPI/components/Tab/01_Assessment.vue b/src/modules/08_KPI/components/Tab/01_Assessment.vue index 3ee7040..5afc8d5 100644 --- a/src/modules/08_KPI/components/Tab/01_Assessment.vue +++ b/src/modules/08_KPI/components/Tab/01_Assessment.vue @@ -169,11 +169,7 @@ function getCriteria() { } const isShowScore = computed(() => { - return ( - store.tabOpen === 3 && - store.tabMain === "3" && - store.dataEvaluation.evaluationStatus === "EVALUATING" - ); + return store.tabOpen === 3 && store.tabMain === "3"; }); watch( diff --git a/src/modules/08_KPI/components/Tab/Dialog/DialogCommentProblem.vue b/src/modules/08_KPI/components/Tab/Dialog/DialogCommentProblem.vue index 1554666..9f53be6 100644 --- a/src/modules/08_KPI/components/Tab/Dialog/DialogCommentProblem.vue +++ b/src/modules/08_KPI/components/Tab/Dialog/DialogCommentProblem.vue @@ -275,7 +275,7 @@ watch(