diff --git a/src/api/14_KPI/api.KPI.ts b/src/api/14_KPI/api.KPI.ts index 9b0e0de25..32658f12a 100644 --- a/src/api/14_KPI/api.KPI.ts +++ b/src/api/14_KPI/api.KPI.ts @@ -88,7 +88,7 @@ export default { /** * ประกาศผล */ - evaluationUser: `${KpiUser}/evaluation/list`, + evaluationUser: `${KpiUser}/evaluation/list-announce`, evaluationUserDone: `${KpiUser}/evaluation/done/kp7`, achievementDev: `${KpiUser}/achievement/development/admin`, achievementDevByid: (id: string) => diff --git a/src/modules/04_registryPerson/components/DialogDevelopmant.vue b/src/modules/04_registryPerson/components/DialogDevelopmant.vue index 079373e6c..5963e8dd3 100644 --- a/src/modules/04_registryPerson/components/DialogDevelopmant.vue +++ b/src/modules/04_registryPerson/components/DialogDevelopmant.vue @@ -142,6 +142,7 @@ const emType = computed(() => { }); const formData = reactive<{ year: number | null; + point: number | null; name: string; group: any[]; target: string; @@ -155,6 +156,7 @@ const formData = reactive<{ year: null, name: "", group: [], + point: 0, target: "", isDevelopment70: false, isDevelopment20: false, @@ -168,6 +170,7 @@ function close() { id.value = ""; formData.name = ""; + formData.point = 0; formData.group = []; formData.target = ""; formData.isDevelopment70 = false; @@ -197,7 +200,10 @@ watch( if (i) { showLoader(); http - .get(config.API.kpiAchievementDevelop + `/registry/${emType.value}/${id.value}`) + .get( + config.API.kpiAchievementDevelop + + `/registry/${emType.value}/${id.value}` + ) .then(async (res) => { const data = res.data.result; formData.year = data.selectTypeYear; @@ -607,6 +613,12 @@ function filterOptionFn(val: string, update: Function) { +
+ ผลการพัฒนา +
+ {{ formData.point }} +
+
diff --git a/src/modules/14_KPI/views/round.vue b/src/modules/14_KPI/views/round.vue index d2ea33607..669b0c866 100644 --- a/src/modules/14_KPI/views/round.vue +++ b/src/modules/14_KPI/views/round.vue @@ -144,7 +144,7 @@ function fetchList() { http .get( config.API.kpiPeriod + - `?page=${formQuery.page}&pageSize=${formQuery.pageSize}&keyword=${formQuery.keyword}&year=${formQuery.year}` + `/user?page=${formQuery.page}&pageSize=${formQuery.pageSize}&keyword=${formQuery.keyword}&year=${formQuery.year}` ) .then((res) => { const data: ResRound[] = res.data.result.data;