diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue index 3197433f3..cca4a51d7 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue @@ -49,6 +49,17 @@ onMounted(() => { fecthResult(assignId.value); }); +const date_start = ref(new Date()); +const date_finish = ref(); +const develop = ref(); +const result = ref(); +const expand_month = ref(); +const reson = ref(""); +const chairman_dated = ref(); +const director1_dated = ref(""); +const director2_dated = ref(""); +const fullname = ref(""); + const fecthAssign = async (id: string) => { showLoader(); await http @@ -56,8 +67,8 @@ const fecthAssign = async (id: string) => { .then((res) => { // assign.value = res.data.data.assign; mentors.value = res.data.data.mentors; - // date_start.value = assign.value.date_start; - // date_finish.value = assign.value.date_finish; + date_start.value = res.data.data.assign.date_start; + date_finish.value = res.data.data.assign.date_finish; director_id.value = res.data.data.chairman.name; director_id2.value = res.data.data.commander.name; @@ -74,16 +85,6 @@ const fecthAssign = async (id: string) => { hideLoader(); }); }; -const date_start = ref(new Date()); -const date_finish = ref(); -const develop = ref(); -const result = ref(); -const expand_month = ref(); -const reson = ref(""); -const chairman_dated = ref(); -const director1_dated = ref(""); -const director2_dated = ref(""); -const fullname = ref(""); const fecthResult = async (id: string) => { await http diff --git a/src/modules/05_placement/components/probation/MainProbation.vue b/src/modules/05_placement/components/probation/MainProbation.vue index 68e75c611..861afdfbd 100644 --- a/src/modules/05_placement/components/probation/MainProbation.vue +++ b/src/modules/05_placement/components/probation/MainProbation.vue @@ -220,7 +220,7 @@ const getpersonalList = async () => { position_level_id: item.position_level_id, organization: item.organization, probation_no: item.probation_no, - order_number: item.order_number, + order_number: item.order_number != "xx/2566" ? item.order_number : "-", probation_status: statusProbationMain(Number(item.probation_status)), })); dataUpdate.value = rows.value;