diff --git a/src/views/mes/deviceledger/detail/editIndex.vue b/src/views/mes/deviceledger/detail/editIndex.vue index 943f52b6..c889d3c4 100644 --- a/src/views/mes/deviceledger/detail/editIndex.vue +++ b/src/views/mes/deviceledger/detail/editIndex.vue @@ -918,7 +918,7 @@ const bjQueryParams = reactive({ pageSize: 10, barCode: undefined as string | undefined, name: undefined as string | undefined, - categoryId: undefined as number | undefined + categoryType: 3 }) const iotDeviceQueryParams = reactive({ @@ -1057,10 +1057,11 @@ const getList = async () => { const bjGetList = async () => { loading.value = true try { - bjQueryParams.categoryId = 5 + bjQueryParams.categoryType = 3 const data = await ProductApi.getProductPage(bjQueryParams) bjList.value = data.list bjTotal.value = data.total + beijianOptions.value = mergeSelectionOptions(beijianOptions.value, buildBeijianOptions(bjList.value)) nextTick(() => { bjToggleSelection() }) @@ -1605,12 +1606,12 @@ const ensureOptionsLoaded = async () => { DeviceTypeApi.getDeviceTypeTree({ pageNo: 1, pageSize: 10 }), getSimpleUserList(), CriticalComponentApi.getCriticalComponentList(), - ProductApi.getComponentSimpleList() + ProductApi.getProductPage({ pageNo: 1, pageSize: 10, categoryType: 3 }) ]) deviceTypeTree.value = deviceTypeRes ?? [] users.value = userRes ?? [] criticalComponentOptions.value = buildCriticalComponentOptions(criticalRes ?? []) - beijianOptions.value = buildBeijianOptions(beijianRes ?? []) + beijianOptions.value = buildBeijianOptions(beijianRes?.list ?? []) } const bindFormData = async (detail: DeviceLedgerVO) => {