From 23ad12bd4c41d43cee714ddd3def24f8ac123a9e Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Mon, 8 Jul 2024 22:41:24 +0700 Subject: [PATCH 1/2] =?UTF-8?q?fixing=20=E0=B8=8A=E0=B8=B7=E0=B9=88?= =?UTF-8?q?=E0=B8=AD=E0=B9=84=E0=B8=9F=E0=B8=A5=E0=B9=8C=E0=B8=AB=E0=B8=99?= =?UTF-8?q?=E0=B8=B1=E0=B8=87=E0=B8=AA=E0=B8=B7=E0=B8=AD=E0=B9=80=E0=B8=A7?= =?UTF-8?q?=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=96=E0=B8=B6=E0=B8=87=E0=B9=81?= =?UTF-8?q?=E0=B8=81=E0=B9=88=E0=B8=81=E0=B8=A3=E0=B8=A3=E0=B8=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/06_retirement/components/resign/DetailDeceased.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/06_retirement/components/resign/DetailDeceased.vue b/src/modules/06_retirement/components/resign/DetailDeceased.vue index 1fbbef2b2..2abe3ba6f 100644 --- a/src/modules/06_retirement/components/resign/DetailDeceased.vue +++ b/src/modules/06_retirement/components/resign/DetailDeceased.vue @@ -87,7 +87,7 @@ const fileDownload = async (type: string) => { .then((res) => { downloadFile( res, - `รายละเอียดบันทึกเวียนแจ้งการถึงแก่กรรม-${fullName}.${type}` + `รายละเอียดบันทึกเวียนแจ้งการถึงแก่กรรม-${fullName.value}.${type}` ); }) .catch(async (e) => { From b085798020bb193f9101ee36451c487942647f94 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Mon, 8 Jul 2024 23:49:44 +0700 Subject: [PATCH 2/2] =?UTF-8?q?fixing=20kpi=20=E0=B8=97=E0=B8=B0=E0=B9=80?= =?UTF-8?q?=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0?= =?UTF-8?q?=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Achievement/05_ResultsPerformance.vue | 6 --- .../stores/ResultsPerformance.ts | 46 ++++++++++--------- 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue b/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue index beb18b59f..2be1c6b2e 100644 --- a/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue +++ b/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue @@ -661,7 +661,6 @@ onMounted(async () => { outlined lazy-rules hide-bottom-space - mask="###" class="inputgreen" v-model="resPerformForm.point1Total" input-class="text-right " @@ -675,7 +674,6 @@ onMounted(async () => { outlined lazy-rules hide-bottom-space - mask="###" class="inputgreen" v-model="resPerformForm.point1" input-class="text-right" @@ -691,7 +689,6 @@ onMounted(async () => { outlined lazy-rules hide-bottom-space - mask="###" class="inputgreen" v-model="resPerformForm.point2Total" input-class="text-right" @@ -705,7 +702,6 @@ onMounted(async () => { outlined lazy-rules hide-bottom-space - mask="###" class="inputgreen" v-model="resPerformForm.point2" input-class="text-right" @@ -721,7 +717,6 @@ onMounted(async () => { outlined lazy-rules hide-bottom-space - mask="###" class="inputgreen" v-model="resPerformForm.pointSumTotal" input-class="text-right" @@ -735,7 +730,6 @@ onMounted(async () => { outlined lazy-rules hide-bottom-space - mask="###" v-model="resPerformForm.pointSum" class="inputgreen" input-class="text-right" diff --git a/src/modules/04_registryNew/stores/ResultsPerformance.ts b/src/modules/04_registryNew/stores/ResultsPerformance.ts index 717d3beb1..c9c8fae1d 100644 --- a/src/modules/04_registryNew/stores/ResultsPerformance.ts +++ b/src/modules/04_registryNew/stores/ResultsPerformance.ts @@ -1,27 +1,29 @@ import { ref } from "vue"; import { defineStore } from "pinia"; -export const useResultsPerformDataStore = defineStore("resultPerformDataStore", () => { +export const useResultsPerformDataStore = defineStore( + "resultPerformDataStore", + () => { + function textRangePoint(val: number | undefined) { + if (val == undefined) val = -1; + if (val < 60.0) return "(คะแนนต่ำกว่าร้อยละ 60.00)"; + if (val >= 60.0 && val <= 69.99) return "(คะแนนร้อยละ 60.00 - 69.99)"; + if (val >= 70.0 && val <= 79.99) return "(คะแนนร้อยละ 70.00 - 79.99)"; + if (val >= 80.0 && val <= 89.99) return " (คะแนนร้อยละ 80.00 - 89.99)"; + if (val >= 90.0) return " (คะแนนร้อยละ 90.00 ขึ้นไป)"; + else return ""; + } - function textRangePoint(val: number | undefined) { - if (val == undefined) val = -1; - if (val >= 0 && val <= 60) return "(ต่ำกว่าร้อยละ 60)"; - if (val >= 60 && val <= 69) return "(ร้อยละ 60 – 69)"; - if (val >= 70 && val <= 79) return "(ร้อยละ 70 – 79)"; - if (val >= 80 && val <= 89) return "(ร้อยละ 80 – 89)"; - if (val >= 90 && val <= 100) return "(ร้อยละ 90 - 100)"; - else return ""; - } - - function textPoint(val: number | undefined) { - if (val == undefined) val = -1; - if (val >= 0 && val <= 60) return "ต้องปรับปรุง"; - if (val >= 60 && val <= 69) return "พอใช้"; - if (val >= 70 && val <= 79) return "ดี"; - if (val >= 80 && val <= 89) return "ดีมาก"; - if (val >= 90 && val <= 100) return "ดีเด่น"; - else return "-"; - } + function textPoint(val: number | undefined) { + if (val == undefined) val = -1; + if (val < 60.0) return "ต้องปรับปรุง"; + if (val >= 60.0 && val <= 69.99) return "พอใช้"; + if (val >= 70.0 && val <= 79.99) return "ดี"; + if (val >= 80.0 && val <= 89.99) return "ดีมาก"; + if (val >= 90.0) return "ดีเด่น"; + else return "-"; + } - return { textRangePoint, textPoint }; -}); + return { textRangePoint, textPoint }; + } +);