diff --git a/dist.tar.gz b/dist.tar.gz index d220e63d..792f7714 100644 Binary files a/dist.tar.gz and b/dist.tar.gz differ diff --git a/src/views/order/orderManagement/archiveOrder.vue b/src/views/order/orderManagement/archiveOrder.vue index 14123196..c14b8b7b 100644 --- a/src/views/order/orderManagement/archiveOrder.vue +++ b/src/views/order/orderManagement/archiveOrder.vue @@ -130,7 +130,9 @@ import { type ToolbarButtonConfig, translateOrderField, getTagType, - fillExpressCompanyScanFieldOptions + fillExpressCompanyScanFieldOptions, + fillStoreScanFieldOptions, + extractStoreListFromResponse } from './config/order-common-config' import PendingOrderDetailPanel from './component/PendingOrderDetailPanel.vue' import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue' @@ -269,14 +271,12 @@ async function loadFilterData() { indexApi.loadStores({ type: 'order' }), indexApi.getExpressList({}) ]) - if (storesRes?.code === 200) { - const f = availableFieldsRef.find((i: any) => i.value === 'store_id') - if (f) f.options = storesRes.stores || [] - } + fillStoreScanFieldOptions(availableFieldsRef, extractStoreListFromResponse(storesRes)) const expressData: any = expressRes?.data const expressRaw = expressData?.list || expressData || [] fillExpressCompanyScanFieldOptions(availableFieldsRef, expressRaw) } catch (e) { + fillStoreScanFieldOptions(availableFieldsRef, []) fillExpressCompanyScanFieldOptions(availableFieldsRef, []) } } diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index a0861f23..1cda54c3 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -501,6 +501,33 @@ export function fillExpressCompanyScanFieldOptions(availableFields: any[], expre if (field) field.options = mapExpressListToCompanySelectOptions(expressRaw) } +/** ScanBox:货主,选项由 index.loadStores + fillStoreScanFieldOptions 注入 */ +export function mapStoreListToSelectOptions(rawStores: any[]): Array<{ label: string; value: number | string }> { + const result: Array<{ label: string; value: number | string }> = [] + const seen = new Set() + for (const item of rawStores || []) { + const rawValue = item?.value ?? item?.store_id ?? item?.id ?? item?.storeId + if (rawValue === undefined || rawValue === null || rawValue === '') continue + const value = Number.isNaN(Number(rawValue)) ? String(rawValue) : Number(rawValue) + const key = String(value) + if (seen.has(key)) continue + const label = + String(item?.label ?? item?.store_name ?? item?.name ?? item?.storeName ?? key).trim() || key + result.push({ label, value }) + seen.add(key) + } + return result +} + +export function extractStoreListFromResponse(storesRes: any): any[] { + return storesRes?.stores || storesRes?.data?.stores || storesRes?.data || [] +} + +export function fillStoreScanFieldOptions(availableFields: any[], rawStores: any[]) { + const field = availableFields.find((f: any) => f.value === 'store_id') + if (field) field.options = mapStoreListToSelectOptions(rawStores) +} + // deliveryOrder相关配置 export const deliveryAvailableFields = [ { label: '货主', value: 'store_id', type: 'select', multiple: true, options: [] }, diff --git a/src/views/order/orderManagement/deliveryException.vue b/src/views/order/orderManagement/deliveryException.vue index ea631023..692c974f 100644 --- a/src/views/order/orderManagement/deliveryException.vue +++ b/src/views/order/orderManagement/deliveryException.vue @@ -131,7 +131,9 @@ import { type ToolbarButtonConfig, translateOrderField, getTagType, - fillExpressCompanyScanFieldOptions + fillExpressCompanyScanFieldOptions, + fillStoreScanFieldOptions, + extractStoreListFromResponse } from './config/order-common-config' import PendingOrderDetailPanel from './component/PendingOrderDetailPanel.vue' import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue' @@ -270,14 +272,12 @@ async function loadFilterData() { indexApi.loadStores({ type: 'order' }), indexApi.getExpressList({}) ]) - if (storesRes?.code === 200) { - const f = availableFieldsRef.find((i: any) => i.value === 'store_id') - if (f) f.options = storesRes.stores || [] - } + fillStoreScanFieldOptions(availableFieldsRef, extractStoreListFromResponse(storesRes)) const expressData: any = expressRes?.data const expressRaw = expressData?.list || expressData || [] fillExpressCompanyScanFieldOptions(availableFieldsRef, expressRaw) } catch (e) { + fillStoreScanFieldOptions(availableFieldsRef, []) fillExpressCompanyScanFieldOptions(availableFieldsRef, []) } } diff --git a/src/views/order/orderManagement/deliveryOrder.vue b/src/views/order/orderManagement/deliveryOrder.vue index fd6bbc14..714f87ff 100644 --- a/src/views/order/orderManagement/deliveryOrder.vue +++ b/src/views/order/orderManagement/deliveryOrder.vue @@ -177,7 +177,9 @@ import { type ToolbarButtonConfig, translateOrderField, getTagType, - fillExpressCompanyScanFieldOptions + fillExpressCompanyScanFieldOptions, + fillStoreScanFieldOptions, + extractStoreListFromResponse } from './config/order-common-config' import PendingOrderDetailPanel from './component/PendingOrderDetailPanel.vue' import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue' @@ -264,9 +266,10 @@ function mapNameOptions(rawList: any[], nameKeys: string[]) { async function loadOrderMetaOptions() { try { - const [expressRes, platformRes] = await Promise.all([ + const [expressRes, platformRes, storesRes] = await Promise.all([ indexApi.getExpressList({}), - indexApi.getPlatformList({}) + indexApi.getPlatformList({}), + indexApi.loadStores({ type: 'order' }) ]) const expressData: any = expressRes?.data const platformData: any = platformRes?.data @@ -276,12 +279,14 @@ async function loadOrderMetaOptions() { const logisticsField = availableFieldsRef.find((i: any) => i.value === 'logistics_name') if (logisticsField) logisticsField.options = mapNameOptions(expressRaw, ['name', 'logistics_name', 'express_name']) fillExpressCompanyScanFieldOptions(availableFieldsRef, expressRaw) + fillStoreScanFieldOptions(availableFieldsRef, extractStoreListFromResponse(storesRes)) const platformField = availableFieldsRef.find((i: any) => i.value === 'sys_platform_name') if (platformField) platformField.options = mapNameOptions(platformRaw, ['name', 'platform_name']) } catch { const logisticsField = availableFieldsRef.find((i: any) => i.value === 'logistics_name') if (logisticsField) logisticsField.options = [] fillExpressCompanyScanFieldOptions(availableFieldsRef, []) + fillStoreScanFieldOptions(availableFieldsRef, []) const platformField = availableFieldsRef.find((i: any) => i.value === 'sys_platform_name') if (platformField) platformField.options = [] } diff --git a/src/views/order/orderManagement/entrustWarehouse.vue b/src/views/order/orderManagement/entrustWarehouse.vue index f1cfaa53..9be695d8 100644 --- a/src/views/order/orderManagement/entrustWarehouse.vue +++ b/src/views/order/orderManagement/entrustWarehouse.vue @@ -130,7 +130,9 @@ import { type ToolbarButtonConfig, translateOrderField, getTagType, - fillExpressCompanyScanFieldOptions + fillExpressCompanyScanFieldOptions, + fillStoreScanFieldOptions, + extractStoreListFromResponse } from './config/order-common-config' import PendingOrderDetailPanel from './component/PendingOrderDetailPanel.vue' import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue' @@ -269,14 +271,12 @@ async function loadFilterData() { indexApi.loadStores({ type: 'order' }), indexApi.getExpressList({}) ]) - if (storesRes?.code === 200) { - const f = availableFieldsRef.find((i: any) => i.value === 'store_id') - if (f) f.options = storesRes.stores || [] - } + fillStoreScanFieldOptions(availableFieldsRef, extractStoreListFromResponse(storesRes)) const expressData: any = expressRes?.data const expressRaw = expressData?.list || expressData || [] fillExpressCompanyScanFieldOptions(availableFieldsRef, expressRaw) } catch (e) { + fillStoreScanFieldOptions(availableFieldsRef, []) fillExpressCompanyScanFieldOptions(availableFieldsRef, []) } } diff --git a/src/views/order/orderManagement/exceptionOrder.vue b/src/views/order/orderManagement/exceptionOrder.vue index ad3c60c1..6181a0a6 100644 --- a/src/views/order/orderManagement/exceptionOrder.vue +++ b/src/views/order/orderManagement/exceptionOrder.vue @@ -350,7 +350,9 @@ import { translateOrderField, formatOrderTime, getTagType, - fillExpressCompanyScanFieldOptions + fillExpressCompanyScanFieldOptions, + fillStoreScanFieldOptions, + extractStoreListFromResponse } from './config/order-common-config' const EXPORT_TIME_PROPS = new Set([ @@ -645,14 +647,11 @@ function buildWhereConditions(rawConditions: Record) { async function loadFilterData() { try { - const [storesRes]: any = await Promise.all([ - indexApi.loadStores({ type: 'order' }) - ]) - if (storesRes?.code === 200) { - const f = availableFieldsRef.find((i: any) => i.value === 'store_id') - if (f) f.options = storesRes.stores || [] - } - } catch (e) {} + const storesRes: any = await indexApi.loadStores({ type: 'order' }) + fillStoreScanFieldOptions(availableFieldsRef, extractStoreListFromResponse(storesRes)) + } catch { + fillStoreScanFieldOptions(availableFieldsRef, []) + } } async function loadOrderMetaOptions() { diff --git a/src/views/order/orderManagement/outboundOrder.vue b/src/views/order/orderManagement/outboundOrder.vue index 710fbe77..512cb71e 100644 --- a/src/views/order/orderManagement/outboundOrder.vue +++ b/src/views/order/orderManagement/outboundOrder.vue @@ -137,14 +137,17 @@
- - +
+ +
+
+ +
i.value === 'logistics_name') if (logisticsField) logisticsField.options = mapNameOptions(expressRaw, ['name', 'logistics_name', 'express_name']) fillExpressCompanyScanFieldOptions(availableFieldsRef, expressRaw) + fillStoreScanFieldOptions(availableFieldsRef, extractStoreListFromResponse(storesRes)) const platformField = availableFieldsRef.find((i: any) => i.value === 'sys_platform_name') if (platformField) platformField.options = mapNameOptions(platformRaw, ['name', 'platform_name']) } catch { const logisticsField = availableFieldsRef.find((i: any) => i.value === 'logistics_name') if (logisticsField) logisticsField.options = [] fillExpressCompanyScanFieldOptions(availableFieldsRef, []) + fillStoreScanFieldOptions(availableFieldsRef, []) const platformField = availableFieldsRef.find((i: any) => i.value === 'sys_platform_name') if (platformField) platformField.options = [] } @@ -493,4 +501,16 @@ function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) { .manual-result { margin-bottom: 12px; } + +.detail-page { + height: 100%; + overflow-x: hidden; + overflow-y: auto; +} + +.order-detail-wrapper, +.order-log-wrapper, +.order-manual-outbound-wrapper { + height: 100%; +} diff --git a/src/views/order/orderManagement/pendingOrder.vue b/src/views/order/orderManagement/pendingOrder.vue index 9265ecc4..412d4551 100644 --- a/src/views/order/orderManagement/pendingOrder.vue +++ b/src/views/order/orderManagement/pendingOrder.vue @@ -264,7 +264,9 @@ import { type ToolbarButtonConfig, translateOrderField, getTagType, - fillExpressCompanyScanFieldOptions + fillExpressCompanyScanFieldOptions, + fillStoreScanFieldOptions, + extractStoreListFromResponse } from './config/order-common-config' import ArchiveOrderPanel from './component/ArchiveOrderPanel.vue' import PendingOrderDetailPanel from './component/PendingOrderDetailPanel.vue' @@ -753,47 +755,12 @@ async function loadOrderMetaOptions() { } } -function normalizeStoreOptions(rawStores: any[]) { - const result: Array<{ label: string; value: number | string }> = [] - const seen = new Set() - for (const item of rawStores || []) { - const rawValue = - item?.value ?? - item?.store_id ?? - item?.id ?? - item?.storeId - if (rawValue === undefined || rawValue === null || rawValue === '') continue - const value = Number.isNaN(Number(rawValue)) ? String(rawValue) : Number(rawValue) - const key = String(value) - if (seen.has(key)) continue - const label = - String( - item?.label ?? - item?.store_name ?? - item?.name ?? - item?.storeName ?? - key - ).trim() || key - result.push({ label, value }) - seen.add(key) - } - return result -} - async function loadStoreOptions() { try { const storesRes: any = await indexApi.loadStores({ type: 'order' }) - const rawStores = storesRes?.stores || storesRes?.data?.stores || storesRes?.data || [] - const normalized = normalizeStoreOptions(rawStores) - const storeField = availableFieldsRef.find((i: any) => i.value === 'store_id') - if (storeField) { - storeField.options = normalized - } + fillStoreScanFieldOptions(availableFieldsRef, extractStoreListFromResponse(storesRes)) } catch { - const storeField = availableFieldsRef.find((i: any) => i.value === 'store_id') - if (storeField) { - storeField.options = [] - } + fillStoreScanFieldOptions(availableFieldsRef, []) } } diff --git a/src/views/order/orderManagement/reviewOrder.vue b/src/views/order/orderManagement/reviewOrder.vue index 885892b2..6b71c11c 100644 --- a/src/views/order/orderManagement/reviewOrder.vue +++ b/src/views/order/orderManagement/reviewOrder.vue @@ -159,7 +159,9 @@ import { type ToolbarButtonConfig, translateOrderField, getTagType, - fillExpressCompanyScanFieldOptions + fillExpressCompanyScanFieldOptions, + fillStoreScanFieldOptions, + extractStoreListFromResponse } from './config/order-common-config' import PendingOrderDetailPanel from './component/PendingOrderDetailPanel.vue' import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue' @@ -238,9 +240,10 @@ function mapCodeOptions(rawList: any[], codeKeys: string[], nameKeys: string[]) async function loadOrderMetaOptions() { try { - const [platformRes, expressRes] = await Promise.all([ + const [platformRes, expressRes, storesRes] = await Promise.all([ indexApi.getPlatformList({}), - indexApi.getExpressList({}) + indexApi.getExpressList({}), + indexApi.loadStores({ type: 'order' }) ]) const platformData: any = platformRes?.data const platformRaw = platformData?.list || platformData || [] @@ -251,10 +254,12 @@ async function loadOrderMetaOptions() { platformField.options = mapCodeOptions(platformRaw, ['code', 'platform_code'], ['name', 'platform_name']) } fillExpressCompanyScanFieldOptions(availableFieldsRef, expressRaw) + fillStoreScanFieldOptions(availableFieldsRef, extractStoreListFromResponse(storesRes)) } catch { const platformField = availableFieldsRef.find((i: any) => i.value === 'sys_platform_code') if (platformField) platformField.options = [] fillExpressCompanyScanFieldOptions(availableFieldsRef, []) + fillStoreScanFieldOptions(availableFieldsRef, []) } } diff --git a/src/views/storage/stockout/component/product.vue b/src/views/storage/stockout/component/product.vue index 1b1e4386..eb925940 100644 --- a/src/views/storage/stockout/component/product.vue +++ b/src/views/storage/stockout/component/product.vue @@ -31,7 +31,7 @@