From 047f711bbfaa133cab469f5b9bae414cc6f30510 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 22 Jan 2025 17:22:46 +0700 Subject: [PATCH 1/4] =?UTF-8?q?fix=20=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=97?= =?UTF-8?q?=E0=B8=94=E0=B8=A5=E0=B8=AD=E0=B8=87=E0=B8=9B=E0=B8=8F=E0=B8=B4?= =?UTF-8?q?=E0=B8=9A=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B8=AB=E0=B8=99=E0=B9=89?= =?UTF-8?q?=E0=B8=B2=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=A3=E0=B8=B2=E0=B8=8A?= =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/probation/FormAssign.vue | 5 ++-- .../probation/FormEvaluation/FormReport.vue | 23 ++++++++++--------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/modules/05_placement/components/probation/FormAssign.vue b/src/modules/05_placement/components/probation/FormAssign.vue index b31b3ad2d..f9c183113 100644 --- a/src/modules/05_placement/components/probation/FormAssign.vue +++ b/src/modules/05_placement/components/probation/FormAssign.vue @@ -1145,11 +1145,12 @@ onMounted(async () => { -
+
{
- - + +
From 1343a255d724286deb5805d4ea28dc757fcb0537 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Wed, 22 Jan 2025 17:27:57 +0700 Subject: [PATCH 2/4] updated --- .../FormEvaluation/FormEvaluateScore.vue | 31 ++++++++++++++++--- .../components/probation/MainSurvey.vue | 2 +- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue index c3f143415..e7a095339 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue @@ -129,6 +129,29 @@ const achievement_result: any = computed(() => { } return 0; }); + +const score1Per60 = computed(() => { + if ( + etc.value === true && + achievement_other.value.text !== undefined && + achievement_other.value.level !== undefined + ) { + return ( + ((learn_level.value + + apply_level.value + + success_level.value + + achievement_other.value.level) / + achievement_score_total.value) * + 60 + ); + } + return ( + ((learn_level.value + apply_level.value + success_level.value) / + achievement_score_total.value) * + 60 + ); +}); + const score2 = computed(() => { let sum_conduct = conduct_level.value.reduce( (sum: number, level: number) => sum + level, @@ -430,7 +453,8 @@ onMounted(async () => { {
-
{{ score1 }}
+
{{ score1Per60 }}
{{ percent_score1 }}
 @@ -987,7 +1011,7 @@ onMounted(async () => {
-
{{ score1 + score2 }}
+
{{ (score1Per60 + score2) / 2 }}
{{ percent_sum }}
 @@ -1360,7 +1384,6 @@ onMounted(async () => { From 74277b635ab42c98985b0cb699905e78d0710bcb Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 22 Jan 2025 17:33:07 +0700 Subject: [PATCH 3/4] fix date --- .../components/probation/FormEvaluation/FormReport.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue index 6e9a31f7f..d620253e9 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue @@ -220,8 +220,8 @@ async function postData(action: string) { pass_result: result.value, reson: reson.value, chairman_dated: chairman_dated.value, - director1_dated: director1_dated.value, - director2_dated: director2_dated.value, + director1_dated: director1_dated.value ? director1_dated.value : new Date(), + director2_dated: director2_dated.value ? director2_dated.value : new Date(), expand_month: expand_month.value ? expand_month.value : undefined, evaluate_no: props?.tab ? Number(props?.tab.charAt(4)) : undefined, }; @@ -233,12 +233,12 @@ async function postData(action: string) { success($q, "บันทึกสำเร็จ"); fecthResult(assignId.value); router.push(`/probation/detail/${personalId.value}/${assignId.value}`); + status.value = false; }) .catch((e: any) => { messageError($q, e); }) .finally(() => { - status.value = false; hideLoader(); }); } else if (action === "put") { @@ -248,13 +248,13 @@ async function postData(action: string) { .then(() => { success($q, "บันทึกสำเร็จ"); fecthResult(assignId.value); + status.value = false; router.push(`/probation/detail/${personalId.value}/${assignId.value}`); }) .catch((e: any) => { messageError($q, e); }) .finally(() => { - status.value = false; hideLoader(); }); } From e3ca5eb4092032eafcd6e44057bea74fc9e9a7d4 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Thu, 23 Jan 2025 09:35:40 +0700 Subject: [PATCH 4/4] fix director1_dated,director2_dated --- .../probation/FormEvaluation/FormReport.vue | 105 ++++-------------- 1 file changed, 22 insertions(+), 83 deletions(-) diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue index d620253e9..606c68a33 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue @@ -34,7 +34,7 @@ const assign = ref([]); const mentors = ref([]); const commander = ref([]); const status = ref(true); -const ID = ref(""); +const evaluateId = ref(""); const date_start = ref(new Date()); const date_finish = ref(); const develop = ref(); @@ -139,13 +139,12 @@ async function fecthAssign() { */ const fecthResult = async (id: string) => { const noNumber = props?.tab ? Number(props?.tab.charAt(4)) : ""; - await http .get(config.API.createformReport(id) + `&evaluate_no=${noNumber}`) .then(async (res: any) => { if (res.data.result != null) { const data = await res.data.result.evaluate; - ID.value = data.id; + evaluateId.value = data.id; date_start.value = data.date_start; date_finish.value = data.date_finish; develop.value = Number(data.develop_complete); @@ -174,54 +173,19 @@ async function savaForm() { }); } -/** แปลงรหัสไฟล์ */ -function downloadFile(response: any, filename: string) { - const link = document.createElement("a"); - var fileName = filename; - link.href = window.URL.createObjectURL(new Blob([response.data])); - link.setAttribute("download", fileName); - document.body.appendChild(link); - link.click(); - document.body.removeChild(link); -} - -/** - * ดาว์โหลดไฟล์ - * @param type docx/pdf - */ -async function clickdownloadFile(type: string) { - showLoader(); - await http - .get(config.API.reportEvaluateResult(type, assignId.value)) - .then(async (res) => { - const data = res.data.result; - await genReport( - data, - `แบบรายงานการประเมินฯ_${person.value.name}.${type}`, - type - ); - hideLoader(); - }) - .catch(async (e) => { - messageError($q, JSON.parse(await e.response.data.text())); - hideLoader(); - }) - .finally(() => {}); -} - /** post/put data * @param action post put */ async function postData(action: string) { - const data = await { + const data = { start_date: date_start.value, date_finish: date_finish.value, develop_complete: develop.value, pass_result: result.value, reson: reson.value, chairman_dated: chairman_dated.value, - director1_dated: director1_dated.value ? director1_dated.value : new Date(), - director2_dated: director2_dated.value ? director2_dated.value : new Date(), + // director1_dated: director1_dated.value ? director1_dated.value : new Date(), + // director2_dated: director2_dated.value ? director2_dated.value : new Date(), expand_month: expand_month.value ? expand_month.value : undefined, evaluate_no: props?.tab ? Number(props?.tab.charAt(4)) : undefined, }; @@ -241,23 +205,24 @@ async function postData(action: string) { .finally(() => { hideLoader(); }); - } else if (action === "put") { - showLoader(); - await http - .put(config.API.createformReport(assignId.value), data) - .then(() => { - success($q, "บันทึกสำเร็จ"); - fecthResult(assignId.value); - status.value = false; - router.push(`/probation/detail/${personalId.value}/${assignId.value}`); - }) - .catch((e: any) => { - messageError($q, e); - }) - .finally(() => { - hideLoader(); - }); } + // else if (action === "put") { + // showLoader(); + // await http + // .put(config.API.createformReport(assignId.value), data) + // .then(() => { + // success($q, "บันทึกสำเร็จ"); + // fecthResult(assignId.value); + // status.value = false; + // router.push(`/probation/detail/${personalId.value}/${assignId.value}`); + // }) + // .catch((e: any) => { + // messageError($q, e); + // }) + // .finally(() => { + // hideLoader(); + // }); + // } } /** ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ */ @@ -299,32 +264,6 @@ onMounted(() => {
แบบรายงานการประเมินฯ
-