diff --git a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/scheduleView.vue b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/scheduleView.vue index 3e734a03..ad4e5250 100644 --- a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/scheduleView.vue +++ b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/scheduleView.vue @@ -137,7 +137,7 @@ defineExpose({ > 移除 diff --git a/apps/web-antd/src/views/property/costManagement/carCharge/data.ts b/apps/web-antd/src/views/property/costManagement/carCharge/data.ts index 803b7262..6406918b 100644 --- a/apps/web-antd/src/views/property/costManagement/carCharge/data.ts +++ b/apps/web-antd/src/views/property/costManagement/carCharge/data.ts @@ -6,9 +6,7 @@ import type { VxeGridProps } from '#/adapter/vxe-table'; import { getDictOptions } from '#/utils/dict'; import { renderDict } from '#/utils/render'; import { costItemSettingList } from '#/api/property/costManagement/costItemSetting'; -import { personList } from '#/api/property/resident/person'; -import { communityTree } from '#/api/property/community'; -import { handleNode } from '@vben/utils'; +import { userList } from '#/api/system/user'; /** * 查询表单 schema @@ -25,12 +23,12 @@ export const querySchema: FormSchemaGetter = () => [ component: 'ApiSelect', componentProps: { api: async () => { - const rows = await personList({ pageSize: 1000000000, pageNum: 1 }); + const rows = await userList({ pageSize: 1000000000, pageNum: 1 }); return rows; }, resultField: 'rows', labelField: 'userName', - valueField: 'id', + valueField: 'userId', }, }, { @@ -106,12 +104,12 @@ export const modalSchema: FormSchemaGetter = () => [ rules: 'required', componentProps: { api: async () => { - const rows = await personList({ pageSize: 1000000000, pageNum: 1 }); + const rows = await userList({ pageSize: 1000000000, pageNum: 1 }); return rows; }, resultField: 'rows', labelField: 'userName', - valueField: 'id', + valueField: 'userId', }, disabled: true, }, @@ -210,12 +208,12 @@ export const addModalSchema: FormSchemaGetter = () => [ rules: 'required', componentProps: { api: async () => { - const rows = await personList({ pageSize: 1000000000, pageNum: 1 }); + const rows = await userList({ pageSize: 1000000000, pageNum: 1 }); return rows; }, resultField: 'rows', labelField: 'userName', - valueField: 'id', + valueField: 'userId', }, }, {