From 38f3118bac07e8331671c21fdd968f4021bc1aa8 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 28 Oct 2024 14:22:08 +0700 Subject: [PATCH 1/5] =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A?= =?UTF-8?q?=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7?= =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=B4=20=3D>=20=E0=B9=80=E0=B8=9E?= =?UTF-8?q?=E0=B8=B4=E0=B9=88=E0=B8=A1=20=E0=B9=80=E0=B8=A5=E0=B8=82?= =?UTF-8?q?=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB?= =?UTF-8?q?=E0=B8=99=E0=B9=88=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/10_registry/views/main.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/modules/10_registry/views/main.vue b/src/modules/10_registry/views/main.vue index 96a98b4..ea9de29 100644 --- a/src/modules/10_registry/views/main.vue +++ b/src/modules/10_registry/views/main.vue @@ -34,6 +34,7 @@ const formData = reactive({ posExecutiveName: "", posTypeName: "", posLevelName: "", + posNo: "", }); const sizeImg = ref(""); function onResize(size: any) { @@ -51,6 +52,7 @@ function getMain() { .get(config.API.profilePosition()) .then(async (res) => { const data = res.data.result; + formData.prefix = data.prefix; formData.firstName = data.firstName; formData.lastName = data.lastName; @@ -59,6 +61,7 @@ function getMain() { formData.posTypeName = data.posTypeName; formData.posExecutiveName = data.posExecutiveName; formData.posLevelName = data.posLevelName; + formData.posNo = data.rootShortName + data.posMaster; store.profileId = data.profileId; if (data.avatarName) { await getImg(data.profileId, data.avatarName); @@ -227,17 +230,18 @@ onMounted(async () => { {{ formData.position ? `${formData.position}` : "-" }} +
{{ formData.posNo }}
- + {{ store.typeProfile == "OFFICER" ? "ตำแหน่งประเภท" : "กลุ่มงาน" @@ -346,6 +350,7 @@ onMounted(async () => { {{ formData.position ? `${formData.position}` : "-" }} +
{{ formData.posNo }}
Date: Mon, 28 Oct 2024 14:28:33 +0700 Subject: [PATCH 2/5] fix --- src/modules/10_registry/components/DialogAddRequestEdit.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/10_registry/components/DialogAddRequestEdit.vue b/src/modules/10_registry/components/DialogAddRequestEdit.vue index 7f6a743..1b46242 100644 --- a/src/modules/10_registry/components/DialogAddRequestEdit.vue +++ b/src/modules/10_registry/components/DialogAddRequestEdit.vue @@ -307,8 +307,8 @@ watch( ที่อยู่ตามทะเบียนบ้าน
  • ที่อยู่ (บ้านเลขที่ หมู่ ตรอก ซอย ถนน ใส่ในฟิลด์นี้)
    • -
  • แขวง/ตำ บล
    • -
  • เขต/อำ เภอ
    • +
  • แขวง/ตำบล
    • +
  • เขต/อำเภอ
  • จังหวัด
  • รหัสไปรษณีย์
From b511a654073ba9f41eab854d7e30137f6564e0f4 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 28 Oct 2024 15:28:12 +0700 Subject: [PATCH 3/5] fix --- src/modules/10_registry/views/main.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/10_registry/views/main.vue b/src/modules/10_registry/views/main.vue index ea9de29..05c4eb2 100644 --- a/src/modules/10_registry/views/main.vue +++ b/src/modules/10_registry/views/main.vue @@ -61,7 +61,7 @@ function getMain() { formData.posTypeName = data.posTypeName; formData.posExecutiveName = data.posExecutiveName; formData.posLevelName = data.posLevelName; - formData.posNo = data.rootShortName + data.posMaster; + formData.posNo = `${data.rootShortName}${data.posMaster}`; store.profileId = data.profileId; if (data.avatarName) { await getImg(data.profileId, data.avatarName); @@ -77,9 +77,9 @@ function getMain() { }); } -function getImg(id: string, pathName: string) { +async function getImg(id: string, pathName: string) { showLoader(); - http + await http .get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, pathName)) .then((res) => { profileImg.value = res.data.downloadUrl; From 7e8bb12cb10e82f693e699d779be847de8c138a6 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 29 Oct 2024 11:18:23 +0700 Subject: [PATCH 4/5] updated code workflow cancel retirement --- src/modules/03_retire/views/addRetire.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/03_retire/views/addRetire.vue b/src/modules/03_retire/views/addRetire.vue index 9993cf9..db00314 100644 --- a/src/modules/03_retire/views/addRetire.vue +++ b/src/modules/03_retire/views/addRetire.vue @@ -627,7 +627,7 @@ onMounted(() => { - + From 935e7172795d8d3d2d3094896a49e9693b333861 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 29 Oct 2024 12:19:39 +0700 Subject: [PATCH 5/5] fixing code workflow --- src/modules/03_retire/views/addRetire.vue | 2 +- src/modules/05_leave/components/DialogDetail.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/03_retire/views/addRetire.vue b/src/modules/03_retire/views/addRetire.vue index db00314..e1c6174 100644 --- a/src/modules/03_retire/views/addRetire.vue +++ b/src/modules/03_retire/views/addRetire.vue @@ -607,7 +607,7 @@ onMounted(() => { dataDetail.status !== 'DONEREJECT' " > - +
diff --git a/src/modules/05_leave/components/DialogDetail.vue b/src/modules/05_leave/components/DialogDetail.vue index 29b3c21..54b5a46 100644 --- a/src/modules/05_leave/components/DialogDetail.vue +++ b/src/modules/05_leave/components/DialogDetail.vue @@ -16,7 +16,7 @@ import type { } from "@/modules/05_leave/interface/response/leave"; import DialogHeader from "@/components/DialogHeader.vue"; -import Workflow from "@/components/Workflow/Main.vue" +import Workflow from "@/components/Workflow/Main.vue"; import FormLeave from "@/modules/05_leave/components/formDetail/01_SickForm.vue"; import FormChildbirth from "@/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue"; import FormHoliday from "@/modules/05_leave/components/formDetail/05_VacationForm.vue"; @@ -495,7 +495,7 @@ watch( :data="formData" /> - +