From 3a9083289c87b60180dd1ee5011b3295d4595990 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Thu, 12 Dec 2024 15:56:52 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B9=80?= =?UTF-8?q?=E0=B9=80=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=9C=E0=B8=A5=20?= =?UTF-8?q?=E0=B9=80=E0=B8=A3=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=87=E0=B8=A5?= =?UTF-8?q?=E0=B8=B2=E0=B8=AD=E0=B8=AD=E0=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/02_resign/ResignByid.vue | 30 +++++++++++++++++-- .../components/03_resignEmp/ResignByid.vue | 29 ++++++++++++++++-- 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/src/modules/06_retirement/components/02_resign/ResignByid.vue b/src/modules/06_retirement/components/02_resign/ResignByid.vue index 6dfbd776f..1e3e31f0d 100644 --- a/src/modules/06_retirement/components/02_resign/ResignByid.vue +++ b/src/modules/06_retirement/components/02_resign/ResignByid.vue @@ -72,6 +72,7 @@ const dataDetail = ref({ fullname: "", statusMain: "", cancelReason: "", + remark: "", }); const workflowRef = ref(null); @@ -534,6 +535,22 @@ function removeFile(fileName: string) { }); } +function convertStatus(val: string) { + if (/^[A-Za-z]+$/.test(val)) { + switch (val) { + case "CAREER": + return "ประกอบอาชีพอื่น"; + case "MOVE": + return "รับราชการสังกัดอื่น"; + case "FAMILY": + return "ดูแลบิดามารดา"; + case "EDUCATION": + return "ศึกษาต่อ"; + case "OTHER": + return "อื่น ๆ"; + } + } else return val; +} /** Hook */ onMounted(async () => { showLoader(); @@ -556,8 +573,9 @@ onMounted(async () => { class="q-mr-sm" @click="router.push('/retirement/resign')" /> - รายละเอียดการลาออก {{ - dataDetail.prefix+dataDetail.firstName + " " + dataDetail.lastName + รายละเอียดการลาออก + {{ + dataDetail.prefix + dataDetail.firstName + " " + dataDetail.lastName }} @@ -621,7 +639,13 @@ onMounted(async () => {
เหตุผลที่ลาออกจากราชการ
-
{{ dataDetail.reason }}
+
+ {{ + `${convertStatus(dataDetail.reason)}${ + dataDetail.remark ? `(${dataDetail.remark})` : "" + }` + }} +
diff --git a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue index 9e206accb..b50a01b24 100644 --- a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue +++ b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue @@ -71,6 +71,7 @@ const dataDetail = ref({ fullname: "", statusMain: "", cancelReason: "", + remark: "", }); const workflowRef = ref(null); @@ -549,6 +550,23 @@ function fetchCheckIsofficer() { }); } +function convertStatus(val: string) { + if (/^[A-Za-z]+$/.test(val)) { + switch (val) { + case "CAREER": + return "ประกอบอาชีพอื่น"; + case "MOVE": + return "รับราชการสังกัดอื่น"; + case "FAMILY": + return "ดูแลบิดามารดา"; + case "EDUCATION": + return "ศึกษาต่อ"; + case "OTHER": + return "อื่น ๆ"; + } + } else return val; +} + /** Hook */ onMounted(async () => { showLoader(); @@ -575,7 +593,8 @@ onMounted(async () => { class="q-mr-sm" @click="router.push('/retirement/resign-employee')" /> - รายละเอียดการลาออก {{ + รายละเอียดการลาออก + {{ dataDetail.prefix + dataDetail.firstName + " " + dataDetail.lastName }}
@@ -640,7 +659,13 @@ onMounted(async () => {
เหตุผลที่ลาออกจากราชการ
-
{{ dataDetail.reason }}
+
+ {{ + `${convertStatus(dataDetail.reason)}${ + dataDetail.remark ? `(${dataDetail.remark})` : "" + }` + }} +