From 275b80b6a0231f08c05e7c912bf324ee825403bb Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Wed, 9 Apr 2025 17:29:43 +0700 Subject: [PATCH 1/3] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=AA?= =?UTF-8?q?=E0=B8=B9=E0=B8=95=E0=B8=A3=E0=B8=84=E0=B8=B3=E0=B8=99=E0=B8=A7?= =?UTF-8?q?=E0=B8=93=20=E0=B8=A5=E0=B8=B2=E0=B8=9E=E0=B8=B1=E0=B8=81?= =?UTF-8?q?=E0=B8=9C=E0=B9=88=E0=B8=AD=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/05_leave/views/Main.vue | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/modules/05_leave/views/Main.vue b/src/modules/05_leave/views/Main.vue index 5ed3618..fa3c763 100644 --- a/src/modules/05_leave/views/Main.vue +++ b/src/modules/05_leave/views/Main.vue @@ -135,10 +135,16 @@ async function fetchStatsTable() { : el.leaveTypeName === "ลากิจส่วนตัว" ? "text-deep-purple" : "text-indigo", - value: el.leavePercent, - all: el.leaveLimit, + value: + (Number(el.leaveCountApprove) / + (Number(el.leaveLimit) + Number(el.leaveExtend))) * + 100, + all: Number(el.leaveLimit) + Number(el.leaveExtend), use: el.leaveCountApprove, - remain: Number(el.leaveLimit) - Number(el.leaveCountApprove), + remain: + Number(el.leaveLimit) + + Number(el.leaveExtend) - + Number(el.leaveCountApprove), })); }); stat.forEach((item) => itemPie.value.push(...item)); From 98b78a2846b0779d192ca7708be00804a2400d37 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Wed, 9 Apr 2025 17:52:45 +0700 Subject: [PATCH 2/3] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=80?= =?UTF-8?q?=E0=B8=AD=E0=B8=B2=20=E0=B8=97=E0=B8=A8=E0=B8=99=E0=B8=B4?= =?UTF-8?q?=E0=B8=A2=E0=B8=A1=E0=B8=AD=E0=B8=AD=E0=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/05_leave/views/Main.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/modules/05_leave/views/Main.vue b/src/modules/05_leave/views/Main.vue index fa3c763..3e7f446 100644 --- a/src/modules/05_leave/views/Main.vue +++ b/src/modules/05_leave/views/Main.vue @@ -135,10 +135,11 @@ async function fetchStatsTable() { : el.leaveTypeName === "ลากิจส่วนตัว" ? "text-deep-purple" : "text-indigo", - value: + value: Math.round( (Number(el.leaveCountApprove) / (Number(el.leaveLimit) + Number(el.leaveExtend))) * - 100, + 100 + ), all: Number(el.leaveLimit) + Number(el.leaveExtend), use: el.leaveCountApprove, remain: From d66a3dcc609433ff8d3f036d5e1523460cfd59ea Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 9 Apr 2025 18:14:10 +0700 Subject: [PATCH 3/3] =?UTF-8?q?fix=20report=20=E0=B8=95=E0=B9=89=E0=B8=99?= =?UTF-8?q?=E0=B8=89=E0=B8=9A=E0=B8=B1=E0=B8=9A=20eva?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ExpertPageDetail.vue | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/modules/06_evaluate/components/ExpertPageDetail.vue b/src/modules/06_evaluate/components/ExpertPageDetail.vue index 904e092..070a51b 100644 --- a/src/modules/06_evaluate/components/ExpertPageDetail.vue +++ b/src/modules/06_evaluate/components/ExpertPageDetail.vue @@ -256,16 +256,16 @@ async function onClickDowloadFile( { govAge: profile.value.government ? `${ - profile.value.government.govAge.day !== 0 - ? `${profile.value.government.govAge.day} วัน` + profile.value.government.govAge.year !== 0 + ? `${profile.value.government.govAge.year} ปี` : "" } ${ profile.value.government.govAge.month !== 0 ? `${profile.value.government.govAge.month} เดือน` : "" } ${ - profile.value.government.govAge.year !== 0 - ? `${profile.value.government.govAge.year} ปี` + profile.value.government.govAge.day !== 0 + ? `${profile.value.government.govAge.day} วัน` : "" }` : ``, @@ -292,13 +292,17 @@ async function onClickDowloadFile( }, } : null, - tp === "EV1_006" ? { commanderFullname: formData.commanderFullname } : null, - tp === "EV1_006" ? { commanderPosition: formData.commanderPosition } : null, + tp === "EV1_006" || tp === "EV1_008" + ? { commanderFullname: formData.commanderFullname } + : null, + tp === "EV1_006" || tp === "EV1_008" + ? { commanderPosition: formData.commanderPosition } + : null, tp === "EV1_006" ? { commanderOrg: "" } : null, - tp === "EV1_006" + tp === "EV1_006" || tp === "EV1_008" ? { commanderAboveFullname: formData.commanderAboveFullname } : null, - tp === "EV1_006" + tp === "EV1_006" || tp === "EV1_008" ? { commanderAbovePosition: formData.commanderAbovePosition } : null, tp === "EV1_006" ? { commanderAboveOrg: "" } : null, @@ -311,7 +315,10 @@ async function onClickDowloadFile( ? { dateRetireLaw: dataPerson.formData.dateRetireLaw } : null, - tp === "EV1_010" ? { subject: formData.subject } : null + tp === "EV1_010" ? { subject: formData.subject } : null, + { typeTh: "เชี่ยวชาญ" }, + { posNoWithSym: `(${dataPerson.formData.posNo})` }, + { orgNoNewLine: dataPerson.formData.org } ); const body = {