Merge branch 'develop' into devTee
This commit is contained in:
commit
ee4428aac2
3 changed files with 4 additions and 1 deletions
|
|
@ -39,6 +39,8 @@ const profileId = ref<string | null>("");
|
|||
async function fetchDataProfile(data: DataProfile) {
|
||||
if (data.profileId) {
|
||||
fetchCheckAvatar(data.profileId);
|
||||
} else {
|
||||
profile.avatar = data?.avatar ? data.avatar : "";
|
||||
}
|
||||
profile.id = data.profileId;
|
||||
profile.fullName = `${data.prefix ?? ""}${data.firstName ?? ""} ${
|
||||
|
|
|
|||
|
|
@ -313,7 +313,7 @@ async function getTable() {
|
|||
res.data.result.map((data: any) => {
|
||||
const rowData = {
|
||||
personalId: data.personalId,
|
||||
avatar: avatar,
|
||||
avatar: data.avatar ? data.avatar : avatar,
|
||||
name: data.fullName,
|
||||
fullName: data.fullName + " " + data.idCard,
|
||||
idCard: data.idCard,
|
||||
|
|
|
|||
|
|
@ -224,6 +224,7 @@ interface Assign {
|
|||
}
|
||||
|
||||
interface DataProfile {
|
||||
avatar?: string;
|
||||
child1: string | null;
|
||||
child1ShortName: string | null;
|
||||
child2: string | null;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue