diff --git a/src/api/mes/deviceledger/index.ts b/src/api/mes/deviceledger/index.ts index c6ed0460..8294b8a2 100644 --- a/src/api/mes/deviceledger/index.ts +++ b/src/api/mes/deviceledger/index.ts @@ -45,6 +45,10 @@ export const DeviceLedgerApi = { return await request.get({ url: `/mes/device-ledger/page`, params }) }, + getDeviceLedgerList: async (params: any) => { + return await request.get({ url: `/mes/device-ledger/list`, params }) + }, + // 查询设备类型详情 getDeviceLedger: async (id: number) => { return await request.get({ url: `/mes/device-ledger/get?id=` + id }) diff --git a/src/views/mes/dvrepair/DvRepairForm.vue b/src/views/mes/dvrepair/DvRepairForm.vue index 067016a3..79e0301f 100644 --- a/src/views/mes/dvrepair/DvRepairForm.vue +++ b/src/views/mes/dvrepair/DvRepairForm.vue @@ -211,8 +211,8 @@ const ensureDeviceOptionsLoaded = async () => { if (deviceOptionsLoaded.value) return deviceLoading.value = true try { - const data = await DeviceLedgerApi.getDeviceLedgerPage({}) - const rows = (data?.list ?? []) as DeviceLedgerVO[] + const data = await DeviceLedgerApi.getDeviceLedgerList({}) + const rows = (Array.isArray(data) ? data : data?.list ?? data?.data ?? []) as DeviceLedgerVO[] deviceOptions.value = rows .filter((r) => typeof r?.id === 'number') .map((r) => ({ label: `${r.deviceCode ?? ''} ${r.deviceName ?? ''}`.trim(), value: r.id, raw: r })) diff --git a/src/views/mes/taskManagement/TaskManagementForm.vue b/src/views/mes/taskManagement/TaskManagementForm.vue index 2611f0be..fb1f9654 100644 --- a/src/views/mes/taskManagement/TaskManagementForm.vue +++ b/src/views/mes/taskManagement/TaskManagementForm.vue @@ -127,11 +127,11 @@ const toCommaSeparatedIds = (value: any): string | undefined => { const ensureOptionsLoaded = async () => { const [deviceRes, planRes, userRes] = await Promise.all([ - DeviceLedgerApi.getDeviceLedgerPage({}), + DeviceLedgerApi.getDeviceLedgerList({}), PlanMaintenanceApi.getPlanMaintenancePage({ pageNo: 1, pageSize: 100 }), getSimpleUserList() ]) - deviceOptions.value = (deviceRes?.list ?? []) as DeviceOption[] + deviceOptions.value = (Array.isArray(deviceRes) ? deviceRes : deviceRes?.list ?? deviceRes?.data ?? []) as DeviceOption[] planOptions.value = (planRes?.list ?? []) as PlanOption[] users.value = userRes ?? [] }