diff --git a/.env.development b/.env.development index 6c8eb32..9419bae 100644 --- a/.env.development +++ b/.env.development @@ -12,7 +12,7 @@ VITE_APP_ENV = 'development' # 罗成 # VITE_APP_BASE_API = 'http://192.168.110.188:8899' # 朱银 -VITE_APP_BASE_API = 'http://192.168.110.149:8899' +VITE_APP_BASE_API = 'http://192.168.110.180:8899' #曾涛 # VITE_APP_BASE_API = 'http://192.168.110.171:8899' diff --git a/src/views/system/user/comm/roleInfo.vue b/src/views/system/user/comm/roleInfo.vue index d733ba0..8cb28d4 100644 --- a/src/views/system/user/comm/roleInfo.vue +++ b/src/views/system/user/comm/roleInfo.vue @@ -276,6 +276,8 @@ const open = async (row?: any, deptId?: any) => { console.log(row); if (row) { try { + console.log(row); + if (!row.createTime) { form.value = { ...row }; // 获取角色列表 @@ -286,8 +288,9 @@ const open = async (row?: any, deptId?: any) => { allRoles.value = roleRes.data.filter((item: Role) => item.roleSort === 1); AppRoles.value = roleRes.data.filter((item: Role) => item.roleSort !== 1); } else { - const { data } = await api.getUser(row.userId); - Object.assign(form.value, data.user); + // const { data } = await api.getUser(row.userId); + const data = row; + Object.assign(form.value, row); // 获取角色列表 if (form.value.deptId) { deptId = form.value.deptId;