diff --git a/src/modules/03_retire/views/addRetire.vue b/src/modules/03_retire/views/addRetire.vue index 9993cf9..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' " > - + @@ -627,7 +627,7 @@ onMounted(() => { - + 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" /> - +
  • ที่อยู่ (บ้านเลขที่ หมู่ ตรอก ซอย ถนน ใส่ในฟิลด์นี้)
  • -
  • แขวง/ตำ บล
  • -
  • เขต/อำ เภอ
  • +
  • แขวง/ตำบล
  • +
  • เขต/อำเภอ
  • จังหวัด
  • รหัสไปรษณีย์
  • diff --git a/src/modules/10_registry/views/main.vue b/src/modules/10_registry/views/main.vue index 96a98b4..05c4eb2 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); @@ -74,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; @@ -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 }}