diff --git a/src/modules/14_KPI/store.ts b/src/modules/14_KPI/store.ts index a581c53e9..4bbdf4d8f 100644 --- a/src/modules/14_KPI/store.ts +++ b/src/modules/14_KPI/store.ts @@ -128,7 +128,11 @@ export const useKpiDataStore = defineStore("KPIDataAdmin", () => { }, { id: "COMPLETE", - name: "เสร็จสิ้น", + name: "รอประกาศผลการประเมิน", + }, + { + id: "KP7", + name: "ประกาศและลงทะเบียนประวัติแล้ว", }, ]); @@ -339,6 +343,10 @@ export const useKpiDataStore = defineStore("KPIDataAdmin", () => { tabOpen.value = 4; tabMain.value = "4"; break; + case "KP7": + tabOpen.value = 4; + tabMain.value = "4"; + break; default: tabOpen.value = 1; tabMain.value = "1"; diff --git a/src/modules/14_KPI/views/detailView.vue b/src/modules/14_KPI/views/detailView.vue index d300bbe90..c8418a60d 100644 --- a/src/modules/14_KPI/views/detailView.vue +++ b/src/modules/14_KPI/views/detailView.vue @@ -112,9 +112,9 @@ async function fetchEvaluation() { .catch((e) => { messageError($q, e); }) - .finally(() => { - hideLoader(); - }); + .finally(() => { + hideLoader(); + }); } async function fetchProfile(id: string) { @@ -279,7 +279,7 @@ function filterOption(val: any, update: Function, refData: string) { // } async function getProfile() { await http - .get(config.API.profilePosition+`/${store.dataEvaluation.profileId}`) + .get(config.API.profilePosition + `/${store.dataEvaluation.profileId}`) .then(async (res) => { const data = await res.data.result; store.dataProfile = await data; @@ -305,7 +305,7 @@ function sendToEvaluatore() { if (id.value) { showLoader(); http - .put(config.API.kpiEvaluationUser+`/status/${id.value}`, { + .put(config.API.kpiEvaluationUser + `/status/${id.value}`, { status: "NEW_EVALUATOR", }) .then((res) => { @@ -804,7 +804,7 @@ onMounted(async () => { store.tabOpen < 4 || (store.tabOpen == 4 && store.rolePerson === 'USER' && - store.dataEvaluation.evaluationStatus != 'COMPLETE') + store.dataEvaluation.evaluationStatus != 'KP7') " /> @@ -1095,4 +1095,4 @@ onMounted(async () => { top: 50%; transform: translateY(-50%); } - \ No newline at end of file +