diff --git a/src/modules/container-loading/pages/GlobalSmartLoadingView.test.ts b/src/modules/container-loading/pages/GlobalSmartLoadingView.test.ts index dcec868d..2fc61325 100644 --- a/src/modules/container-loading/pages/GlobalSmartLoadingView.test.ts +++ b/src/modules/container-loading/pages/GlobalSmartLoadingView.test.ts @@ -659,6 +659,8 @@ describe('GlobalSmartLoadingView', () => { expect(source).toContain('min-height: 112px') expect(source).toContain("label: '预计到货时间'") expect(source).toContain("label: '订单状态'") + expect(source).toContain('.smart-loading-query .query-toolbar__filters) { flex-wrap: nowrap; gap: 8px; overflow-x: auto; }') + expect(source).toContain('.smart-loading-query .query-toolbar__actions) { flex-wrap: nowrap; gap: 6px; }') expect(source).toContain(':page-sizes="[20, 50, 100]"') }) diff --git a/src/modules/container-loading/pages/GlobalSmartLoadingView.vue b/src/modules/container-loading/pages/GlobalSmartLoadingView.vue index 6afec1a8..4b1cce18 100644 --- a/src/modules/container-loading/pages/GlobalSmartLoadingView.vue +++ b/src/modules/container-loading/pages/GlobalSmartLoadingView.vue @@ -192,11 +192,11 @@ const candidateOrderStatusOptions = computed(() => [...new Set(candidates.value .filter(Boolean))] .map((status) => ({ value: status, label: candidateOrderStatusLabel(status) }))) const queryFields = computed(() => [ - { key: 'warehouseId', type: 'select', label: '发货仓', placeholder: '全部发货仓', width: 180, options: warehouseOptions.value, props: { filterable: true } }, - { key: 'customerId', type: 'select', label: '客户', placeholder: '全部客户', width: 220, options: customers.value.filter((customer) => customer.status === 'ACTIVE').map((customer) => ({ label: customer.tenantName, value: String(customer.id) })), props: { filterable: true, loading: customersLoading.value } }, - { key: 'inboundCode', type: 'input', label: '入仓码', placeholder: '请输入入仓码', width: 240 }, - { key: 'expectedArrivalRange', type: 'daterange', label: '预计到货时间', placeholder: '请选择预计到货时间范围', width: 300 }, - { key: 'orderStatus', type: 'select', label: '订单状态', placeholder: '全部订单状态', width: 200, options: candidateOrderStatusOptions.value }, + { key: 'warehouseId', type: 'select', label: '发货仓', placeholder: '全部发货仓', width: 160, options: warehouseOptions.value, props: { filterable: true } }, + { key: 'customerId', type: 'select', label: '客户', placeholder: '全部客户', width: 180, options: customers.value.filter((customer) => customer.status === 'ACTIVE').map((customer) => ({ label: customer.tenantName, value: String(customer.id) })), props: { filterable: true, loading: customersLoading.value } }, + { key: 'inboundCode', type: 'input', label: '入仓码', placeholder: '请输入入仓码', width: 210 }, + { key: 'expectedArrivalRange', type: 'daterange', label: '预计到货时间', placeholder: '请选择预计到货时间范围', width: 260 }, + { key: 'orderStatus', type: 'select', label: '订单状态', placeholder: '全部订单状态', width: 160, options: candidateOrderStatusOptions.value }, ]) const filteredContainers = computed(() => containers.value.filter((item) => ( @@ -739,6 +739,9 @@ onMounted(() => { void load(); void loadCustomers() }) .compact-summary dd { margin: 0; color: var(--cc-text); font-size: 12px; } .compact-summary strong { color: var(--el-color-primary); font-size: 14px; } :deep(.smart-loading-query.query-toolbar) { padding: 0; border: 0; background: transparent; } +:deep(.smart-loading-query .query-toolbar__filters) { flex-wrap: nowrap; gap: 8px; overflow-x: auto; } +:deep(.smart-loading-query .query-toolbar__tail) { flex-wrap: nowrap; gap: 8px; } +:deep(.smart-loading-query .query-toolbar__actions) { flex-wrap: nowrap; gap: 6px; } .pane-header small,.container-option span,.global-loading-page small { color: var(--cc-muted); font-size: 12px; } .dispatch-grid { display: grid; grid-template-columns: minmax(390px, 1.1fr) minmax(320px, .9fr) minmax(460px, 1.35fr); height: clamp(520px, 68vh, 720px); min-height: 0; overflow-x: auto; border: 1px solid var(--cc-border); background: #fff; } .embedded-smart-loading .dispatch-grid { min-height: 520px; height: min(62vh, 700px); } @@ -774,6 +777,7 @@ onMounted(() => { void load(); void loadCustomers() }) .candidate-group { display: grid; gap: 4px; } .candidate-block { color: var(--el-color-danger) !important; } @media (max-width: 1180px) { + :deep(.smart-loading-query .query-toolbar__filters),:deep(.smart-loading-query .query-toolbar__tail),:deep(.smart-loading-query .query-toolbar__actions) { flex-wrap: wrap; overflow: visible; } .dispatch-grid { grid-template-columns: 1fr; height: auto; min-height: 0; overflow: visible; } .embedded-smart-loading .dispatch-grid { height: auto; } .dispatch-pane + .dispatch-pane { border-top: 1px solid var(--cc-border); border-left: 0; } diff --git a/src/modules/unified-orders/pages/UnifiedOrdersView.vue b/src/modules/unified-orders/pages/UnifiedOrdersView.vue index bb54e7d9..18732d4a 100644 --- a/src/modules/unified-orders/pages/UnifiedOrdersView.vue +++ b/src/modules/unified-orders/pages/UnifiedOrdersView.vue @@ -831,7 +831,7 @@ async function updateMeasurementCalculationMode(row: Record | n version: measurement.version, actualGoodsName: measurement.actualGoodsName, items: measurement.items.map((item) => ({ - inboundDetailId: item.inboundDetailId || undefined, + inboundDetailId: item.inboundDetailId ?? undefined, boxCode: item.boxCode, itemNo: item.itemNo, boxSpecification: item.boxSpecification, @@ -892,7 +892,7 @@ async function saveWarehouseOuterDimensions(row: Record) { version: measurement.version, actualGoodsName: measurement.actualGoodsName, items: measurement.items.map((item) => ({ - inboundDetailId: item.inboundDetailId || undefined, + inboundDetailId: item.inboundDetailId ?? undefined, boxCode: item.boxCode, itemNo: item.itemNo, boxSpecification: item.boxSpecification,