diff --git a/src/api/14_KPI/api.KPI.ts b/src/api/14_KPI/api.KPI.ts index b8fd56c69..04d37619e 100644 --- a/src/api/14_KPI/api.KPI.ts +++ b/src/api/14_KPI/api.KPI.ts @@ -54,8 +54,8 @@ export default { kpiUserCapacity: `${KpiUser}/capacity`, KpiEvaluationInfo, Kpiorg, - kpiEvaluationCheck: `${kpiEvaluation}/check`, - kpiSendToStatus: (id: string) => `${kpiEvaluation}/status/${id}`, + kpiEvaluationCheck: `${kpiEvaluationUser}/check`, + kpiSendToStatus: (id: string) => `${kpiEvaluationUser}/status/${id}`, kpiReqEdit: (id: string) => `${kpiEvaluation}/edit/${id}`, /**ประเมิน*/ kpiAchievementDevelop: `${kpiAchievement}/development`, @@ -70,12 +70,17 @@ export default { kpiLink, - profilePosition:`${env.API_URI}/org/profile/profileid/position`, + profilePosition: `${env.API_URI}/org/profile/profileid/position`, placementKeycloak, profilePositionKey: () => `${env.API_URI}/org/profile/keycloak/position`, /** Report*/ kpiReport: () => `${KPI}/report/announcement`, sendToCommander: `${KpiUser}/evaluation/admin/change-status`, - sendToSummary: (id: string) => `${kpiEvaluation}/summary/${id}`, - updatePoint: (id: string) => `${kpiEvaluation}/point/${id}`, + sendToSummary: (id: string) => `${kpiEvaluationUser}/summary/${id}`, + updatePoint: (id: string) => `${kpiEvaluationUser}/point/${id}`, + kpiSendToReason: (id: string, type: string) => + `${kpiEvaluationUser}/reason/${type}/${id}`, + + kpiSendToGet: (id: string) => `${kpiEvaluationUser}/reason/${id}`, + openPoint: (id: string) => `${kpiEvaluationUser}/open/${id}`, }; diff --git a/src/api/file/api.file.ts b/src/api/file/api.file.ts index 313474d5e..459d6d091 100644 --- a/src/api/file/api.file.ts +++ b/src/api/file/api.file.ts @@ -1,6 +1,6 @@ import env from "../index"; const url = `${env.API_URI}/salary`; - +const KpiFile = `${env.API_URI}/salary/file`; export default { subFile: (name: string, group: string, id: string, subId: string) => `${url}/sub-file/${name}/${group}/${id}/${subId}`, @@ -15,7 +15,7 @@ export default { file: (name: string, group: string, id: string) => `${url}/file/${name}/${group}/${id}`, - + KpiFile, fileByPath: (name: string) => `${url}/file/${name}`, fileByFile: (name: string, group: string, id: string, fileName: string) => diff --git a/src/modules/14_KPI/components/Tab/04_Result.vue b/src/modules/14_KPI/components/Tab/04_Result.vue new file mode 100644 index 000000000..6c87c0b0e --- /dev/null +++ b/src/modules/14_KPI/components/Tab/04_Result.vue @@ -0,0 +1,616 @@ + + + + diff --git a/src/modules/14_KPI/components/Tab/05_File.vue b/src/modules/14_KPI/components/Tab/05_File.vue index 7d970f5cc..7752bb03b 100644 --- a/src/modules/14_KPI/components/Tab/05_File.vue +++ b/src/modules/14_KPI/components/Tab/05_File.vue @@ -25,7 +25,7 @@ interface ArrayFileList { fileName: string; } -const isReadonly = (route.name === "KPIEditEvaluator" ? true : false); +const isReadonly = ref(route.name === "KPIEditEvaluator" ? true : false); const documentFile = ref(null); const fileList = ref([]); @@ -77,7 +77,7 @@ async function clickUpload(file: any) { const formdata = new FormData(); formdata.append("file", selectedFile); await http - .post(config.API.file + `/KPI/ไฟล์เอกสาร/${id.value}`, { + .post(config.API.KpiFile + `/KPI/ไฟล์เอกสาร/${id.value}`, { replace: false, fileList: fileName, }) @@ -106,7 +106,7 @@ async function clickUpload(file: any) { function downloadFile(fileName: string) { showLoader(); http - .get(config.API.file + `/KPI/ไฟล์เอกสาร/${id.value}/${fileName}`) + .get(config.API.KpiFile + `/KPI/ไฟล์เอกสาร/${id.value}/${fileName}`) .then((res) => { const data = res.data.downloadUrl; window.open(data, "_blank"); @@ -127,7 +127,7 @@ function deleteFile(fileName: string) { dialogRemove($q, async () => { showLoader(); http - .delete(config.API.file + `/KPI/ไฟล์เอกสาร/${id.value}/${fileName}`) + .delete(config.API.KpiFile + `/KPI/ไฟล์เอกสาร/${id.value}/${fileName}`) .then((res) => { success($q, `ลบไฟล์สำเร็จ`); @@ -158,7 +158,7 @@ onMounted(() => {
-
+
{ const data = res.data.result; store.dataEvaluation = await data; - store.dataProfile = await data; + // store.dataProfile = await data; formProfile.status = store.convertStatus(data.evaluationStatus); formProfile.result = store.convertResults(data.evaluationResults); store.checkCompetency(); @@ -278,11 +279,11 @@ function filterOption(val: any, update: Function, refData: string) { // } async function getProfile() { await http - .get(config.API.profilePositionKey()) + .get(config.API.profilePosition+`/${store.dataEvaluation.profileId}`) .then(async (res) => { const data = await res.data.result; store.dataProfile = await data; - + await store.checkStep(); }) .catch((e) => { messageError($q, e); @@ -293,7 +294,7 @@ async function getProfile() { } async function getAll() { await fetchEvaluation(); - await store.checkStep(); + getProfile(); getOrgOp(); }