From b7a6c919ec1a2b23dbb7e083f6cab75b1222ee21 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 20 May 2024 09:41:43 +0700 Subject: [PATCH 1/2] =?UTF-8?q?fix=20bug=20=E0=B8=82=E0=B9=89=E0=B8=AD?= =?UTF-8?q?=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=AA=E0=B9=88=E0=B8=A7=E0=B8=99?= =?UTF-8?q?=E0=B8=95=E0=B8=B1=E0=B8=A7=20>=20=E0=B8=82=E0=B9=89=E0=B8=AD?= =?UTF-8?q?=E0=B8=A1=E0=B8=B9=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=AD=E0=B8=A2?= =?UTF-8?q?=E0=B8=B9=E0=B9=88=20>=20=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?= =?UTF-8?q?=E0=B8=82=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5?= =?UTF-8?q?=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=AD=E0=B8=A2=E0=B8=B9=E0=B9=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/detail/PersonalInformation/03_Address.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/03_Address.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/03_Address.vue index 0673166c6..11237ef9d 100644 --- a/src/modules/04_registryNew/components/detail/PersonalInformation/03_Address.vue +++ b/src/modules/04_registryNew/components/detail/PersonalInformation/03_Address.vue @@ -759,7 +759,7 @@ onMounted(async () => { :rules="[(val:string) => !!val || `${'กรุณาเลือก เขต / อำเภอ'}`]" @update:model-value="(value:string) => selectDistrict(value, '2')" @filter="(inputValue:string, - doneFn:Function) => filterSelector(inputValue, doneFn,'districtOps' + doneFn:Function) => filterSelector(inputValue, doneFn,'districtCOps' ) " /> @@ -782,7 +782,7 @@ onMounted(async () => { :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง / ตำบล'}`]" @update:model-value="(value:string) => selectSubDistrict(value, '2')" @filter="(inputValue:string, - doneFn:Function) => filterSelector(inputValue, doneFn,'subdistrictOps' + doneFn:Function) => filterSelector(inputValue, doneFn,'subdistrictCOps' ) " /> From 9bae48eb68ebb22d6dedd5e5058432d7e45805fa Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 20 May 2024 10:11:43 +0700 Subject: [PATCH 2/2] =?UTF-8?q?=E0=B8=9A=E0=B8=A3=E0=B8=A3=E0=B8=88?= =?UTF-8?q?=E0=B8=B8=20=E0=B9=81=E0=B8=95=E0=B9=88=E0=B8=87=E0=B8=95?= =?UTF-8?q?=E0=B8=B1=E0=B9=89=E0=B8=87=20=E0=B9=80=E0=B8=A5=E0=B8=B7?= =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=99=E0=B8=A2=E0=B9=89=E0=B8=B2=E0=B8=A2?= =?UTF-8?q?=20>=20=E0=B9=80=E0=B8=A1=E0=B8=99=E0=B8=B9=E0=B8=82=E0=B8=AD?= =?UTF-8?q?=E0=B9=82=E0=B8=AD=E0=B8=99=20=E0=B8=9B=E0=B8=A3=E0=B8=B1?= =?UTF-8?q?=E0=B8=9A=20card=20profile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CardProfile.vue | 4 +++- .../components/Transfer/transferRegistry.vue | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/components/CardProfile.vue b/src/components/CardProfile.vue index 9bd8a66e9..fb3745005 100644 --- a/src/components/CardProfile.vue +++ b/src/components/CardProfile.vue @@ -40,7 +40,9 @@ function fetchDataProfile(data: DataProfile) { fetchProfile(data.profileId); } profile.id = data.profileId; - profile.fullName = `${data.prefix}${data.firstName} ${data.lastName}`; + profile.fullName = `${data.prefix ?? ""}${data.firstName ?? ""} ${ + data.lastName ?? "" + } `; profile.position = data.position == "" || data.position === null ? "-" : data.position; if (data.posTypeName && data.posLevelName) { diff --git a/src/modules/05_placement/components/Transfer/transferRegistry.vue b/src/modules/05_placement/components/Transfer/transferRegistry.vue index 06232eb6a..f5c56f2a9 100644 --- a/src/modules/05_placement/components/Transfer/transferRegistry.vue +++ b/src/modules/05_placement/components/Transfer/transferRegistry.vue @@ -10,12 +10,14 @@ import config from "@/app.config"; import keycloak from "@/plugins/keycloak"; import type { QTableProps, QForm } from "quasar"; +import type { DataProfile } from "@/modules/05_placement/interface/index/Main"; import type { TypeFile, ResponseDataDetail, rowFile, } from "@/modules/05_placement/interface/response/Transfer"; import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue"; +import CardProfile from "@/components/CardProfile.vue"; const modalPersonal = ref(false); const personId = ref(""); @@ -28,6 +30,7 @@ const dataId = route.params.id as string; const myForm = ref(null); const roleAdmin = ref(false); const edit = ref(false); +const dataProfile = ref(); const organizationPositionOld = ref(""); const positionTypeOld = ref(""); @@ -164,6 +167,7 @@ const getData = async () => { .get(config.API.transferId(dataId.toString())) .then((res: any) => { const data = res.data.result; + dataProfile.value = res.data.result as unknown as DataProfile; id.value = data.id; let list: TypeFile[] = []; if (data.docs.length > 0) { @@ -319,7 +323,8 @@ onMounted(async () => { /> รายละเอียดการขอโอนของ {{ responseData.fullname }} - + +