From b27e5324bc276daa6db7a3be6c0e8403d4fe50a5 Mon Sep 17 00:00:00 2001 From: hwj Date: Wed, 8 Jul 2026 15:25:46 +0800 Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E8=AE=BE=E5=A4=87=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6-=E5=A4=87=E4=BB=B6=E9=80=89=E9=A1=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/deviceledger/DeviceLedgerForm.vue | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/views/mes/deviceledger/DeviceLedgerForm.vue b/src/views/mes/deviceledger/DeviceLedgerForm.vue index cf434a6e..9847f9b0 100644 --- a/src/views/mes/deviceledger/DeviceLedgerForm.vue +++ b/src/views/mes/deviceledger/DeviceLedgerForm.vue @@ -643,7 +643,7 @@ @@ -669,7 +669,7 @@ v-model="bjQueryParams.barCode" :placeholder="t('SparePartsManagement.SpareInfo.placeholderCode')" clearable - @keyup.enter="handleQuery" + @keyup.enter="bjHandleQuery" class="!w-240px" /> @@ -997,6 +997,7 @@ const criticalComponentOptions = ref([]) const beijianOptions = ref([]) const savedCriticalComponentOptions = ref([]) const savedBeijianOptions = ref([]) +const SPARE_PART_CATEGORY_TYPE = 3 const buildCriticalComponentOptions = (items: any[] = []): SelectionOption[] => (items ?? []) .map((item: any) => { @@ -1262,12 +1263,12 @@ const ensureOptionsLoaded = async () => { DeviceTypeApi.getDeviceTypeTree({ pageNo: 1, pageSize: 10 }), getSimpleUserList(), CriticalComponentApi.getCriticalComponentList(), - ProductApi.getComponentSimpleList() + ProductApi.getProductPage({ pageNo: 1, pageSize: 10, categoryType: SPARE_PART_CATEGORY_TYPE }) ]) deviceTypeTree.value = deviceTypeRes users.value = userRes ?? [] criticalComponentOptions.value = buildCriticalComponentOptions(criticalRes ?? []) - beijianOptions.value = buildBeijianOptions(beijianRes ?? []) + beijianOptions.value = buildBeijianOptions(beijianRes?.list ?? []) } /** 鎵撳紑寮圭獥 */ @@ -1340,8 +1341,9 @@ const queryParams = reactive({ const bjQueryParams = reactive({ pageNo: 1, pageSize: 10, + barCode: undefined, name: undefined, - categoryId: undefined + categoryType: SPARE_PART_CATEGORY_TYPE }) const iotDeviceQueryParams = reactive({ @@ -1483,10 +1485,11 @@ const getList = async () => { const bjGetList = async () => { loading.value = true try { - bjQueryParams.categoryId = 5 + bjQueryParams.categoryType = SPARE_PART_CATEGORY_TYPE const data = await ProductApi.getProductPage(bjQueryParams) bjList.value = data.list bjTotal.value = data.total + beijianOptions.value = mergeSelectionOptions(beijianOptions.value, buildBeijianOptions(bjList.value)) // 鏁版嵁鍔犺浇鍚庯紝閲嶆柊璁剧疆閫変腑鐘舵€? nextTick(() => { bjToggleSelection()