From 451def7e8ed7274224a48fdf9714d21337baa3cd Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 29 Jan 2025 10:35:39 +0700 Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=97=E0=B8=94=E0=B8=A5=E0=B8=AD?= =?UTF-8?q?=E0=B8=87=E0=B8=87=E0=B8=B2=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../probation/FormEvaluation/Header.vue | 5 + .../probation/FormEvaluation/Template3.vue | 33 +------ .../FormEvaluation/TemplateSummaryScore.vue | 95 +++++++++++++++++++ .../components/probation/MainDetail.vue | 20 ++-- .../components/probation/SummaryScore.vue | 48 ++++++++-- 5 files changed, 153 insertions(+), 48 deletions(-) create mode 100644 src/modules/05_placement/components/probation/FormEvaluation/TemplateSummaryScore.vue diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Header.vue b/src/modules/05_placement/components/probation/FormEvaluation/Header.vue index 2f7c29eb5..c92247eda 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/Header.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/Header.vue @@ -2,6 +2,10 @@ import { ref, watch } from "vue"; import { useRoute } from "vue-router"; +import { useProbationDataStore } from "@/modules/05_placement/storeProbation"; + +const DataStore = useProbationDataStore(); + const tabHead = ref("save1"); const route = useRoute(); const checkRoutePermisson = ref(route.name == "probationFormDetail"); @@ -71,6 +75,7 @@ function nextPage() {
ครั้งที่ {{ i }}
("save1"); const tabs = ref([]); const dataArrayNumber = ref(1); -const evaluate = ref([]); const assignId = ref(route.params.form.toString()); -const personalId = ref(route.params.personalId.toString()); const isLoad = ref(false); const fullName = ref(""); @@ -137,22 +123,11 @@ onMounted(() => { - - - +
diff --git a/src/modules/05_placement/components/probation/MainDetail.vue b/src/modules/05_placement/components/probation/MainDetail.vue index 2f8f89a7e..5501b5fb1 100644 --- a/src/modules/05_placement/components/probation/MainDetail.vue +++ b/src/modules/05_placement/components/probation/MainDetail.vue @@ -45,22 +45,17 @@ const TabsTemplate3 = defineAsyncComponent( ) ); -const SummaryScore = defineAsyncComponent( - () => import("@/modules/05_placement/components/probation/SummaryScore.vue") +const TabsTemplateSummaryScore = defineAsyncComponent( + () => + import( + "@/modules/05_placement/components/probation/FormEvaluation/TemplateSummaryScore.vue" + ) ); const $q = useQuasar(); const mixin = useCounterMixin(); -const { - date2Thai, - dateToISO, - success, - messageError, - showLoader, - hideLoader, - dialogConfirm, -} = mixin; +const { messageError } = mixin; const router = useRouter(); const route = useRoute(); @@ -288,7 +283,8 @@ onMounted(async () => { - + + diff --git a/src/modules/05_placement/components/probation/SummaryScore.vue b/src/modules/05_placement/components/probation/SummaryScore.vue index e31447e43..dbf1e8166 100644 --- a/src/modules/05_placement/components/probation/SummaryScore.vue +++ b/src/modules/05_placement/components/probation/SummaryScore.vue @@ -13,6 +13,10 @@ const checkRoutePermisson = ref(route.name == "probationFormDetail"); const assignId = ref(route.params.form.toString()); const status = ref(false); +const props = defineProps({ + tab: { type: String, require: true }, +}); + const develop_orientation_score = ref(); const develop_self_learning_score = ref(); const develop_training_seminar_score = ref(); @@ -54,8 +58,13 @@ const result_option = reactive([ /** get คะแนน */ async function getReportScore() { showLoader(); + const noNumber = props?.tab ? Number(props?.tab.charAt(4)) : ""; + await http - .get(config.API.summaryReportDetail(assignId.value)) + .get( + config.API.summaryReportDetail(assignId.value) + + `&evaluate_no=${noNumber}` + ) .then((res) => { const data = res.data.result; develop_orientation_score.value = data.develop_orientation_score; @@ -138,15 +147,24 @@ onMounted(() => { - + ผ่าน (สูงกว่าร้อยละ 60) - + ไม่ผ่าน (ต่ำกว่าร้อยละ 60) + @@ -171,10 +189,18 @@ onMounted(() => { - + ผ่าน (สูงกว่าร้อยละ 60) - + ไม่ผ่าน (ต่ำกว่าร้อยละ 60) @@ -204,10 +230,18 @@ onMounted(() => { - + ผ่าน (สูงกว่าร้อยละ 60) - + ไม่ผ่าน (ต่ำกว่าร้อยละ 60)