From 23632cadd4c7c32d661da2842c840108357f489a Mon Sep 17 00:00:00 2001 From: Tanyalak Date: Fri, 14 Jul 2023 09:13:08 +0700 Subject: [PATCH 1/3] no message --- .../05_placement/components/probation/AddWork.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/05_placement/components/probation/AddWork.vue b/src/modules/05_placement/components/probation/AddWork.vue index 887042841..5e8482384 100644 --- a/src/modules/05_placement/components/probation/AddWork.vue +++ b/src/modules/05_placement/components/probation/AddWork.vue @@ -54,7 +54,7 @@
2 ผู้ดูแลการทดลองปฏิบัติหน้าที่ราชการ (อาจมีได้มากกว่า 1 คน) - +
3.1 ชื่องาน / ภารกิจงานที่มอบหมาย (ควรมีมากกว่า 1 ภารกิจงาน) - +
@@ -153,7 +153,7 @@
ความรู้ความสามารถในการปฏิบัติงาน - +
@@ -194,7 +194,7 @@
ความรู้เรื่องกฎหมายและกฎระเบียบ (ไม่เกิน 20 หัวข้อ) - +
@@ -457,7 +457,7 @@
3.6 ผลผลิตของงานที่คาดหวังและตัวชี้วัดความสําเร็จของงาน - +
From 4d6c9295b08ed6afa52a5db9f52f07d27916998b Mon Sep 17 00:00:00 2001 From: waruneeta Date: Fri, 14 Jul 2023 10:34:40 +0700 Subject: [PATCH 2/3] fix bug display bma office status --- .../components/PersonalList/Table.vue | 51 +++++++++++-------- .../components/PersonalList/TableDetail.vue | 18 +++---- 2 files changed, 40 insertions(+), 29 deletions(-) diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue index a8fd8bfbc..619c25cc4 100644 --- a/src/modules/05_placement/components/PersonalList/Table.vue +++ b/src/modules/05_placement/components/PersonalList/Table.vue @@ -133,6 +133,34 @@ const columns = ref([ }, ]); +const convertBmaOfficer = (val: string) => { + switch (val) { + case "OFFICER": + return "ขรก.กทม. สามัญ"; + case "EMPLOYEE_PERM": + return "ลูกจ้างประจำ"; + case "EMPLOYEE_TEMP": + return "ลูกจ้างชั่วคราว"; + default: + return "บุคคลภายนอก"; + } +}; + +const convertContainStatus = (val: string) => { + switch (val) { + case "UN-CONTAIN": + return "ยังไม่บรรจุ"; + case "PREPARE-CONTAIN": + return "เตรียมบรรจุ"; + case "CONTAIN": + return "บรรจุแล้ว"; + case "DISCLAIM": + return "สละสิทธิ์"; + default: + return "-"; + } +}; + const getTable = async () => { showLoader(); await http @@ -153,27 +181,10 @@ const getTable = async () => { positionPath: data.positionPath, reportingDate: dateText(new Date(data.reportingDate)), number: data.number, - bmaOfficer: - data.bmaOfficer == "OFFICER" - ? "ขรก.กทม. สามัญ" - : data.bmaOfficer == "EMPLOYEE_PERM" - ? "ลูกจ้างประจำ" - : data.bmaOfficer == "EMPLOYEE_TEMP" - ? "ลูกจ้างชั่วคราว" - : data.bmaOfficer == null - ? "บุคคลภายนอก" - : "-", + bmaOfficer: convertBmaOfficer(data.bmaOfficer), statusId: data.statusId, - statusName: - data.statusId == "UN-CONTAIN" - ? "ยังไม่บรรจุ" - : data.statusId == "PREPARE-CONTAIN" - ? "เตรียมบรรจุ" - : data.statusId == "CONTAIN" - ? "บรรจุแล้ว" - : data.statusId == "DISCLAIM" - ? "สละสิทธิ์" - : "-", + statusName: convertContainStatus(data.statusId) + , deferment: data.deferment, }; diff --git a/src/modules/05_placement/components/PersonalList/TableDetail.vue b/src/modules/05_placement/components/PersonalList/TableDetail.vue index 63a08798a..3b3f2cc10 100644 --- a/src/modules/05_placement/components/PersonalList/TableDetail.vue +++ b/src/modules/05_placement/components/PersonalList/TableDetail.vue @@ -149,19 +149,17 @@ const fetchData = async () => { }; const formBmaofficer = (val: string) => { switch (val) { - case "officer": + case "OFFICER": return "ขรก.กทม. สามัญ"; - break; - case "employee_perm": + case "EMPLOYEE_PERM": return "ลูกจ้างประจำ"; - break; - case "employee_temp": + case "EMPLOYEE_TEMP": return "ลูกจ้างชั่วคราว"; - break; default: - ""; + return ""; } }; + const close = async () => { props.close(); selection.value = []; @@ -199,8 +197,10 @@ const putpersonalForm = async () => {
ข้อมูลทั่วไป - {{ - formBmaofficer(personalForm.bmaofficer) }} + + + {{ formBmaofficer(personalForm.bmaOfficer) }} +
From d027b69b5478d1f51a3c75742f9034edb82bf0a1 Mon Sep 17 00:00:00 2001 From: Thanit Konmek Date: Fri, 14 Jul 2023 10:48:46 +0700 Subject: [PATCH 3/3] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A?= =?UTF-8?q?=E0=B9=84=E0=B8=AD=E0=B8=84=E0=B8=AD=E0=B8=99=20=E0=B8=A2?= =?UTF-8?q?=E0=B8=81=E0=B9=80=E0=B8=A5=E0=B8=B4=E0=B8=81=E0=B8=AB=E0=B8=A3?= =?UTF-8?q?=E0=B8=B7=E0=B8=AD=E0=B8=81=E0=B8=A5=E0=B8=B1=E0=B8=9A=20?= =?UTF-8?q?=E0=B8=AD=E0=B8=A2=E0=B8=B9=E0=B9=88=E0=B8=97=E0=B8=B2=E0=B8=87?= =?UTF-8?q?=E0=B8=8B=E0=B9=89=E0=B8=B2=E0=B8=A2=E0=B8=AB=E0=B8=99=E0=B9=89?= =?UTF-8?q?=E0=B8=B2=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=A5=E0=B8=B0?= =?UTF-8?q?=E0=B9=80=E0=B8=AD=E0=B8=B5=E0=B8=A2=E0=B8=94=E0=B8=82=E0=B9=89?= =?UTF-8?q?=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=AA=E0=B9=88=E0=B8=A7?= =?UTF-8?q?=E0=B8=99=E0=B8=95=E0=B8=B1=E0=B8=A7=E0=B8=82=E0=B8=AD=E0=B8=87?= =?UTF-8?q?=E0=B8=9C=E0=B8=B9=E0=B9=89=E0=B8=AA=E0=B8=AD=E0=B8=9A=E0=B8=9C?= =?UTF-8?q?=E0=B9=88=E0=B8=B2=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PersonalDetail/Information/top.vue | 71 ++++++++++++++++--- 1 file changed, 60 insertions(+), 11 deletions(-) diff --git a/src/modules/05_placement/components/PersonalDetail/Information/top.vue b/src/modules/05_placement/components/PersonalDetail/Information/top.vue index 807a8d143..e0c947a87 100644 --- a/src/modules/05_placement/components/PersonalDetail/Information/top.vue +++ b/src/modules/05_placement/components/PersonalDetail/Information/top.vue @@ -87,31 +87,80 @@ const add = () => {