diff --git a/src/modules/01_exam/components/Form/Information.vue b/src/modules/01_exam/components/Form/Information.vue index 1ce0db8..984875f 100644 --- a/src/modules/01_exam/components/Form/Information.vue +++ b/src/modules/01_exam/components/Form/Information.vue @@ -422,8 +422,8 @@ const myform = ref({}) const myformcitizen = ref({}) const img = ref('') const fileProfile = ref([]) -const cardid1 = ref('') -const cardid2 = ref('') +const cardid1 = ref('') +const cardid2 = ref('') const opNat = ref(['ไทย']) const idModel = ref(false) @@ -451,6 +451,15 @@ const fetchData = async () => { const data = res.data.result defaultInformation.value.prefixId = data.prefixId selectPrefix() + if ((data.lastName = null)) { + data.lastName = keycloak.tokenParsed == null ? '' : keycloak.tokenParsed.family_name + } + if ((data.firstname = null)) { + data.firstname = keycloak.tokenParsed == null ? '' : keycloak.tokenParsed.given_name + } + if ((data.email = null)) { + data.email = keycloak.tokenParsed == null ? '' : keycloak.tokenParsed.email + } defaultInformation.value.lastname = data.lastName defaultInformation.value.provinceId = data.citizenProvinceId defaultInformation.value.districtId = data.citizenDistrictId @@ -484,13 +493,14 @@ const checkCardId = async () => { myformcitizen.value.validate().then(async (result: boolean) => { if (result) { idModel.value = false - defaultInformation.value.cardid = cardid2.value await http .put(config.API.candidateCheckCitizen(examId.value, positionId.value), { citizenId: cardid2.value }) .then((res) => { success + + defaultInformation.value.cardid = cardid2.value }) .catch((e) => { messageError($q, e) @@ -595,6 +605,8 @@ const getClass = (val: boolean) => { const idDialog = () => { idModel.value = true + cardid2.value = defaultInformation.value.cardid + cardid1.value = defaultInformation.value.cardid }