diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Footer.vue b/src/modules/05_placement/components/probation/FormEvaluation/Footer.vue deleted file mode 100644 index 20f98ed57..000000000 --- a/src/modules/05_placement/components/probation/FormEvaluation/Footer.vue +++ /dev/null @@ -1,83 +0,0 @@ - - - \ No newline at end of file diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue index 15dde4bc2..6ae8a75d0 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue @@ -41,7 +41,7 @@ const props = defineProps({ }); onMounted(async () => { - console.log("tab===>", props.tab); + // console.log("tab===>", props.tab); if (props.tab !== undefined) { round.value = props.tab.charAt(4); @@ -50,6 +50,7 @@ onMounted(async () => { } await fecthFormdata(assignId.value); }); + const fecthFormdata = async (id: string) => { await http .get(config.API.formevaluateRecord(id)) @@ -64,13 +65,14 @@ const fecthFormdata = async (id: string) => { option.value.push(res.data.data.director); Autherise.value = res.data.data.director.name; list1_1.value = res.data.data.assign_output; - evaluate_expenct_level.value = res.data.data.assign_output.map((e) => ({ + evaluate_expenct_level.value = res.data.data.assign_output.map((e: any) => ({ id: e.id, labal: e.output_desc, })); - evaluate_ouptut.value = res.data.data.assign_output.map((e) => ({ + evaluate_ouptut.value = res.data.data.assign_output.map((e: any) => ({ id: e.id, })); + checkArray.value = list1_1.value.length; console.log(res.data.data.evaluate_no, round.value); @@ -87,7 +89,7 @@ const fecthFormRound = async (id: string, no: string) => { showLoader(); await http .get(config.API.formevaluateround(id, no)) - .then((res: any) => { + .then(async(res: any) => { // console.log(res); let data = res.data.data.evaluate; start_date.value = data.date_start; @@ -133,6 +135,14 @@ const fecthFormRound = async (id: string, no: string) => { ) { etc2.value = true; } + + if (data.achievements) { + await data.achievements.map((e: any, index: number) => { + evaluate_expenct_level.value[index].level = e.evaluate_expect_level + evaluate_ouptut.value[index].text = e.evaluate_output_desc + evaluate_ouptut.value[index].level = e.evaluate_output_level + }); + } status.value = false; }) .catch((e) => { @@ -405,7 +415,7 @@ const saveformdata = async (data: any) => {
- {{ "ครั้งที่" + round }} + {{ "ครั้งที่ " + round }} ระหว่างวันที่ {{ date2Thai(start_date) }} ถึงวันที่ @@ -447,6 +457,7 @@ const saveformdata = async (data: any) => { color="grey" :color-selected="ratingColors" label="ระดับการประเมินพฤติกรรม" + :disable="!status" >