diff --git a/src/modules/02_organizational/views/MainTreeEmployee.vue b/src/modules/02_organizational/views/MainTreeEmployee.vue index ec671f3bf..988a34527 100644 --- a/src/modules/02_organizational/views/MainTreeEmployee.vue +++ b/src/modules/02_organizational/views/MainTreeEmployee.vue @@ -1077,6 +1077,7 @@ const fetchData = async () => { positionEmployeeStatus: r.positionEmployeeStatus, positionMasterUserNote: r.positionMasterUserNote, qualification: r.qualification, + organizationId: r.organizationId, }); }); }) @@ -1602,6 +1603,7 @@ const selectData = async (props: any) => { isCondition.value = props.isCondition; conditionNote.value = props.conditionNote; id.value = props.id; + selected.value = props.organizationId; }; /** diff --git a/src/modules/04_registry/components/Profile.vue b/src/modules/04_registry/components/Profile.vue index e745a6b8e..034d853d8 100644 --- a/src/modules/04_registry/components/Profile.vue +++ b/src/modules/04_registry/components/Profile.vue @@ -833,8 +833,6 @@ const fetchData = async () => { const reason = reasonOptions.value.filter( (r: DataOption) => r.id == data.leaveReason ); - console.log(reason); - if (reason.length > 0) { leaveReason.value = ` (พ้นจากราชการด้วยสาเหตุ: ${reason[0].name})`; } else if (data.leaveReason !== null && data.leaveReason !== "") { diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue index 3234ca4e0..471b59e0a 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue @@ -76,7 +76,7 @@ const edit = () => { const cancel = () => { status.value = false; - fecthAssign() + fecthAssign(); }; const props = defineProps({ @@ -89,8 +89,6 @@ const list2_1 = probationStore.behavior_no1; const list2_2 = probationStore.behavior_no2; const list2_3 = probationStore.behavior_no3; - - const fecthAssign = async () => { showLoader(); await http @@ -105,7 +103,9 @@ const fecthAssign = async () => { start_date.value = res.data.data.start_date; date_finish.value = res.data.data.end_date; } - Autherise.value = res.data.data.commander.name; + Autherise.value = + probationStore.director.name + + ` (${probationStore.director.PositionLineName}, ${probationStore.director.PositionLevelName}, ${probationStore.director.Oc})`; }) .catch((e) => { messageError($q, e); @@ -269,8 +269,6 @@ onMounted(async () => { fetchEvaluate(); } }); - -