Commit efb2ef3eb3f782598612d7d13fd6886894b1e772
1 parent
745fd6d1
fix: DEFECT-996 sysadmin checkout user open personal modal not update personal info
Showing
2 changed files
with
10 additions
and
8 deletions
| @@ -181,9 +181,9 @@ | @@ -181,9 +181,9 @@ | ||
| 181 | const newItem = JSON.parse(getItem); | 181 | const newItem = JSON.parse(getItem); |
| 182 | updataPersonlData.value = newItem; | 182 | updataPersonlData.value = newItem; |
| 183 | }; | 183 | }; |
| 184 | - | ||
| 185 | - const [registerModal, { closeModal }] = useModalInner(async (data) => { | 184 | + const [registerModal, { closeModal }] = useModalInner(async () => { |
| 186 | refreshCacheGetData(); | 185 | refreshCacheGetData(); |
| 186 | + const userInfo = userStore.getUserInfo; | ||
| 187 | try { | 187 | try { |
| 188 | if (updataPersonlData.value != null) { | 188 | if (updataPersonlData.value != null) { |
| 189 | (peresonalPic.value = updataPersonlData.value.avatar), | 189 | (peresonalPic.value = updataPersonlData.value.avatar), |
| @@ -194,13 +194,13 @@ | @@ -194,13 +194,13 @@ | ||
| 194 | }); | 194 | }); |
| 195 | getPersonalDetailValue.value = updataPersonlData.value; | 195 | getPersonalDetailValue.value = updataPersonlData.value; |
| 196 | } else { | 196 | } else { |
| 197 | - if (data.userInfo) { | ||
| 198 | - getPersonalDetailValue.value = data.userInfo; | ||
| 199 | - peresonalPic.value = data.userInfo.avatar; | 197 | + if (userInfo) { |
| 198 | + getPersonalDetailValue.value = userInfo; | ||
| 199 | + peresonalPic.value = userInfo.avatar; | ||
| 200 | setFieldsValue({ | 200 | setFieldsValue({ |
| 201 | - realName: data.userInfo.realName, | ||
| 202 | - phoneNumber: data.userInfo.phoneNumber, | ||
| 203 | - email: data.userInfo.email, | 201 | + realName: userInfo.realName, |
| 202 | + phoneNumber: userInfo.phoneNumber, | ||
| 203 | + email: userInfo.email, | ||
| 204 | }); | 204 | }); |
| 205 | } | 205 | } |
| 206 | } | 206 | } |
| @@ -40,6 +40,8 @@ export interface UserInfo { | @@ -40,6 +40,8 @@ export interface UserInfo { | ||
| 40 | tenantName?: string; | 40 | tenantName?: string; |
| 41 | roles?: string[]; | 41 | roles?: string[]; |
| 42 | plainRoles?: PlainRoleInfo[]; | 42 | plainRoles?: PlainRoleInfo[]; |
| 43 | + phoneNumber?: string; | ||
| 44 | + email?: string; | ||
| 43 | } | 45 | } |
| 44 | 46 | ||
| 45 | export interface BeforeMiniState { | 47 | export interface BeforeMiniState { |