|
@@ -520,8 +520,8 @@ const contentConfig = reactive<IContentConfig<UserPageQuery>>({
|
|
|
indexAction: async (params) => {
|
|
indexAction: async (params) => {
|
|
|
const res = await UserAPI.listUser(params as UserPageQuery);
|
|
const res = await UserAPI.listUser(params as UserPageQuery);
|
|
|
return {
|
|
return {
|
|
|
- total: res.data.data.total,
|
|
|
|
|
- list: res.data.data.items,
|
|
|
|
|
|
|
+ total: res.data.data?.total || 0,
|
|
|
|
|
+ list: res.data.data?.items || res.data.data?.list || [],
|
|
|
};
|
|
};
|
|
|
},
|
|
},
|
|
|
deleteAction: async (ids) => {
|
|
deleteAction: async (ids) => {
|
|
@@ -658,7 +658,7 @@ const curdContentConfig = {
|
|
|
const res = await UserAPI.listUser(q as unknown as UserPageQuery);
|
|
const res = await UserAPI.listUser(q as unknown as UserPageQuery);
|
|
|
return {
|
|
return {
|
|
|
total: res.data?.data?.total ?? 0,
|
|
total: res.data?.data?.total ?? 0,
|
|
|
- list: res.data?.data?.items ?? [],
|
|
|
|
|
|
|
+ list: res.data?.data?.items || res.data?.data?.list || [],
|
|
|
};
|
|
};
|
|
|
},
|
|
},
|
|
|
});
|
|
});
|
|
@@ -742,7 +742,7 @@ async function handleOpenDialog(type: "create" | "update" | "detail", id?: numbe
|
|
|
deptOptions.value = formatTree(deptResponse.data.data);
|
|
deptOptions.value = formatTree(deptResponse.data.data);
|
|
|
|
|
|
|
|
const roleResponse = await RoleAPI.listRole();
|
|
const roleResponse = await RoleAPI.listRole();
|
|
|
- roleOptions.value = roleResponse.data.data.items
|
|
|
|
|
|
|
+ roleOptions.value = (roleResponse.data.data?.items || roleResponse.data.data?.list || [])
|
|
|
.filter((item) => item.id !== undefined && item.name !== undefined)
|
|
.filter((item) => item.id !== undefined && item.name !== undefined)
|
|
|
.map((item) => ({
|
|
.map((item) => ({
|
|
|
value: item.id as number,
|
|
value: item.id as number,
|
|
@@ -752,7 +752,7 @@ async function handleOpenDialog(type: "create" | "update" | "detail", id?: numbe
|
|
|
.filter((opt) => !opt.disabled);
|
|
.filter((opt) => !opt.disabled);
|
|
|
|
|
|
|
|
const positionResponse = await PositionAPI.listPosition();
|
|
const positionResponse = await PositionAPI.listPosition();
|
|
|
- positionOptions.value = positionResponse.data.data.items
|
|
|
|
|
|
|
+ positionOptions.value = (positionResponse.data.data?.items || positionResponse.data.data?.list || [])
|
|
|
.filter((item) => item.id !== undefined && item.name !== undefined)
|
|
.filter((item) => item.id !== undefined && item.name !== undefined)
|
|
|
.map((item) => ({
|
|
.map((item) => ({
|
|
|
value: item.id as number,
|
|
value: item.id as number,
|