From 72dd92ff54d64b7762e5a05a9e5a15272f9f7803 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Fri, 17 May 2024 12:09:59 +0700 Subject: [PATCH] fixing bug --- src/api/14_KPI/api.KPI.ts | 24 ++++++++++++++++--- .../Tab/Dialog/01_FormIndicator.vue | 4 ++-- .../Tab/Dialog/04_FormCompetency.vue | 6 ++--- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/api/14_KPI/api.KPI.ts b/src/api/14_KPI/api.KPI.ts index bc4f01250..08671f05b 100644 --- a/src/api/14_KPI/api.KPI.ts +++ b/src/api/14_KPI/api.KPI.ts @@ -1,11 +1,11 @@ import env from "../index"; const KPI = `${env.API_URI}/kpi`; const kpiPeriod = `${env.API_URI}/kpi/period`; -const kpiEvaluation = `${env.API_URI}/kpi/user/evaluation`; +const kpiEvaluation = `${env.API_URI}/kpi/evaluation`; const kpiPlan = `${env.API_URI}/kpi/plan`; const kpiRole = `${env.API_URI}/kpi/role`; const kpiSpecial = `${env.API_URI}/kpi/special`; -const KpiCapacity = `${env.API_URI}/kpi/capacity`; +const kpiCapacity = `${env.API_URI}/kpi/capacity`; const KpiFile = `${env.API_URI}/salary/file`; const KpiEvaluationInfo = `${env.API_URI}/kpi/evaluation`; const Kpiorg = `${env.API_URI}/org/profile/commander`; @@ -16,16 +16,25 @@ const kpiReason = `${env.API_URI}/kpi/reason`; const urlFile = `${env.API_URI}/salary`; +const kpiGroup = `${env.API_URI}/kpi/group`; +const kpiLink = `${env.API_URI}/kpi/link`; + export default { KPI, /** รอบการประเมินผล*/ kpiPeriod, kpiPeriodById: (id: string) => `${kpiPeriod}/${id}`, + kpiEvaluation, kpiPlan, + kpiPlanById: (id: string) => `${kpiPlan}/${id}`, + + /** role */ kpiRole, + kpiRoleMainList: `${KPI}/role`, + kpiSpecial, - KpiCapacity, + kpiCapacity, KpiFile: KpiFile, kpiAchievement: (type: string) => `${kpiAchievement}/${type}`, @@ -47,4 +56,13 @@ export default { kpiCommentP: (typP: string, type: string, role: string, id: string) => `${kpiReason}/${typP}/${type}/${role}/${id}`, + + kpiGroup, + kpiGroupById: (id: string) => `${kpiGroup}/${id}`, + + /** สมรรถนะ */ + + kpiLink, + + profilePosition: () => `${env.API_URI}/org/profile/keycloak/position`, }; diff --git a/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue b/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue index 383316661..558e494aa 100644 --- a/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue +++ b/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue @@ -5,7 +5,7 @@ import { useRoute } from "vue-router"; import config from "@/app.config"; import http from "@/plugins/http"; -import type { DataOptions } from "@/modules/14_KPI/interface/index/Main"; +import type { DataOption } from "@/modules/14_KPI/interface/index/Main"; import DialogHeader from "@/components/DialogHeader.vue"; @@ -79,7 +79,7 @@ const formDetail = reactive({ }); /** Option รอบการประเมิน*/ -const roundOp = ref([ +const roundOp = ref([ { id: "APR", name: "รอบเมษายน" }, { id: "OCT", name: "รอบตุลาคม" }, ]); diff --git a/src/modules/14_KPI/components/Tab/Dialog/04_FormCompetency.vue b/src/modules/14_KPI/components/Tab/Dialog/04_FormCompetency.vue index 9d2f9e00d..539b3bc3e 100644 --- a/src/modules/14_KPI/components/Tab/Dialog/04_FormCompetency.vue +++ b/src/modules/14_KPI/components/Tab/Dialog/04_FormCompetency.vue @@ -1,7 +1,7 @@