diff --git a/src/api/probation/api.probation.ts b/src/api/probation/api.probation.ts index 003d1eb..0d4be07 100644 --- a/src/api/probation/api.probation.ts +++ b/src/api/probation/api.probation.ts @@ -21,6 +21,7 @@ export default { `${probation}/data-options/knowledge?personal_id=${personalId}`, probationsGetAssign: (assignId: string) => `${probation}/assign/probation-assign?assign_id=${assignId}`, + probationsGetAssignNew: (assignId: string) => `${probation}/assign?assign_id=${assignId}`, summarySurveyDetail: (id: string) => `${probation}/survey?assign_id=${id}`, summaryDetail: () => `${probation}/survey`, saveEditAssign: (personalId: string) => diff --git a/src/modules/15_probationReport/components/03_AssignPage.vue b/src/modules/15_probationReport/components/03_AssignPage.vue index 47c6631..6ebcfdc 100644 --- a/src/modules/15_probationReport/components/03_AssignPage.vue +++ b/src/modules/15_probationReport/components/03_AssignPage.vue @@ -763,7 +763,7 @@ async function DataSave(id: string) { /** get ข้อมูลรายการมอบหมาย */ async function getAssign() { await http - .get(config.API.probationsGetAssign(probationStore.assignId)) + .get(config.API.probationsGetAssignNew(probationStore.assignId)) .then((res) => { isEdit.value = false; const data = res.data.result; diff --git a/src/modules/15_probationReport/interface/Main.ts b/src/modules/15_probationReport/interface/Main.ts index 5f56050..ef1950a 100644 --- a/src/modules/15_probationReport/interface/Main.ts +++ b/src/modules/15_probationReport/interface/Main.ts @@ -71,6 +71,13 @@ interface ProbationReportType { pass_result: number; evaluate_date: Date; } + +interface FileType{ + path:string + pathname:string + fileName:string + title:string +} export type { ListDataText, DataSurvey, @@ -78,4 +85,5 @@ export type { AppointTopicMain, AppointTopic, ProbationReportType, + FileType }; diff --git a/src/modules/15_probationReport/views/main.vue b/src/modules/15_probationReport/views/main.vue index ba9a0ec..e8a2d86 100644 --- a/src/modules/15_probationReport/views/main.vue +++ b/src/modules/15_probationReport/views/main.vue @@ -11,6 +11,7 @@ import { useProbationReport } from "@/modules/15_probationReport/store"; import type { DataSurvey, ProbationReportType, + FileType } from "@/modules/15_probationReport/interface/Main"; import SurveyPage from "@/modules/15_probationReport/components/01_SurveyPage.vue"; @@ -25,9 +26,12 @@ const { showLoader, hideLoader, messageError } = mixin; const dataSurvey = ref(null); const isData = ref(true); -const dataProbation = ref(""); -const dataResult1 = ref(""); -const dataResult2 = ref(""); +const dataProbation = ref([]); +const dataResult1 = ref([]); +const dataResult2 = ref([]); +// const dataProbation = ref(""); +// const dataResult1 = ref(""); +// const dataResult2 = ref(""); const formDataResult = ref({ develop_orientation_score: 0, @@ -115,15 +119,15 @@ async function getSalary( id: string, name: string, group: string, - val: Ref + val: Ref ) { await http .get(config.API.developmentSalaryFile(name, group, id)) .then((res) => { - val.value = res.data.fileName; + val.value = res.data; }) .catch((e) => { - messageError($q, e); + // messageError($q, e); }); } @@ -170,16 +174,16 @@ onMounted(async () => { > - +