diff --git a/src/views/message/index.vue b/src/views/message/index.vue
index 67b1e575..99dc461e 100644
--- a/src/views/message/index.vue
+++ b/src/views/message/index.vue
@@ -157,14 +157,32 @@
—
+ {{ selectedRow.id ?? '—' }}
+ {{ selectedRow.warehouse_id ?? '—' }}
+ {{ selectedRow.store_id ?? '—' }}
+ {{ selectedRow.store_name || '—' }}
+ {{ selectedRow.creator_id ?? '—' }}
+ {{ selectedRow.inbox_message_id ?? '—' }}
+ {{ selectedRow.claim_needed ? '是' : '否' }}
+ {{ selectedRow.claim_amount ?? '—' }}
+ {{ selectedRow.carrier_claim_needed ? '是' : '否' }}
+ {{ selectedRow.carrier_claim_amount ?? '—' }}
{{ selectedRow.description || '—' }}
{{ selectedRow.waybill_no || '—' }}
{{ selectedRow.order_delivery_no || '—' }}
{{ selectedRow.entry_order_no || '—' }}
{{ selectedRow.order_stockout_no || '—' }}
{{ selectedRow.receiving_no || '—' }}
+ {{ selectedRow.waybill_id ?? '—' }}
+ {{ selectedRow.order_id ?? '—' }}
+ {{ selectedRow.entry_order_id ?? '—' }}
+ {{ selectedRow.order_stockout_id ?? '—' }}
+ {{ selectedRow.receiving_id ?? '—' }}
{{ selectedRow.created_at || '—' }}
{{ selectedRow.updated_at || '—' }}
+ {{ selectedRow.started_at || '—' }}
+ {{ selectedRow.completed_at || '—' }}
+ {{ selectedRow.deleted_at || '—' }}
{{ selectedRow.resolution || '—' }}
diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts
index 910acbec..9b8f5939 100644
--- a/src/views/order/orderManagement/config/order-common-config.ts
+++ b/src/views/order/orderManagement/config/order-common-config.ts
@@ -1245,6 +1245,21 @@ export const waveIndexRangeScanField = scanBasicField({
defaultOperator: 'between',
hideOperator: true
})
+/** ScanBox:波次类型(wave_scope)。后端按值解析 wave_id 范围:
+ * 0=未分配波次(wave_id = 0)、1=团购(反查 wave_type=1 的波次ID)、2=散单(反查 wave_type=2 的波次ID);
+ * 多选(如 [1,2])由后端将两个范围条件 OR 合并。 */
+export const waveScopeScanField = scanBasicField({
+ label: '波次类型',
+ value: 'wave_scope',
+ type: 'select',
+ multiple: true,
+ conditionType: 'number',
+ options: [
+ { label: '未分配波次', value: 0 },
+ { label: '团购', value: 1 },
+ { label: '散单', value: 2 }
+ ]
+})
export const deliveryOrderCodeScanField = scanBasicField({ label: '发货单号', value: 'delivery_order_code', type: 'text', operators: ORDER_BULK_SEARCH_OPERATORS, defaultOperator: 'eq' })
/** ScanBox:外部订单号(待处理订单专用,模糊匹配发货单号,替代表格右上角快捷搜索) */
export const pendingOrderQuickSearchScanField = scanBasicField({ label: '外部订单号', value: 'delivery_order_code', type: 'text', operators: ORDER_BULK_SEARCH_OPERATORS, defaultOperator: 'like' })
@@ -1407,6 +1422,7 @@ export const deliveryAvailableFields = [
{ ...orderIdScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...waveIndexRangeScanField, group: SCAN_ORDER_INFO_GROUP },
+ { ...waveScopeScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...waybillCodesScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...orderFlagScanField, group: SCAN_ORDER_INFO_GROUP },
@@ -1602,6 +1618,7 @@ export const reviewAvailableFields = [
{ ...orderIdScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...waveIndexRangeScanField, group: SCAN_ORDER_INFO_GROUP },
+ { ...waveScopeScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...shopNickScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...sysPlatformCodeScanField, group: SCAN_ORDER_INFO_GROUP },
@@ -1761,6 +1778,7 @@ export const pendingAvailableFields = [
{ ...orderIdScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...waveIndexRangeScanField, group: SCAN_ORDER_INFO_GROUP },
+ { ...waveScopeScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...waybillCodesScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...orderFlagScanField, group: SCAN_ORDER_INFO_GROUP },
@@ -2135,6 +2153,7 @@ export const expectionOrderAvailableFields = [
{ ...orderIdScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...waveIndexRangeScanField, group: SCAN_ORDER_INFO_GROUP },
+ { ...waveScopeScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...expressCodeScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...orderFlagScanField, group: SCAN_ORDER_INFO_GROUP },
@@ -2255,6 +2274,7 @@ export const archiveAvailableFields = [
{ ...orderIdScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...waveIndexRangeScanField, group: SCAN_ORDER_INFO_GROUP },
+ { ...waveScopeScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...shopNickScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP },
diff --git a/src/views/order/orderManagement/utils/order-index-helpers.ts b/src/views/order/orderManagement/utils/order-index-helpers.ts
index c94feca4..fffe6c6e 100644
--- a/src/views/order/orderManagement/utils/order-index-helpers.ts
+++ b/src/views/order/orderManagement/utils/order-index-helpers.ts
@@ -402,6 +402,12 @@ export function buildOrderWhereConditions(rawConditions: Record
) {
value: condition
}
})
+ // 波次类型 wave_scope:单值归一为标量 eq,多值保留数组(后端按 wave_type 反查波次ID 后 OR 合并)
+ if (where.wave_scope && typeof where.wave_scope === 'object' && 'value' in where.wave_scope) {
+ const rawValue = (where.wave_scope as { value: unknown }).value
+ const value = Array.isArray(rawValue) && rawValue.length === 1 ? rawValue[0] : rawValue
+ where.wave_scope = { operator: 'eq', value }
+ }
return where
}
diff --git a/src/views/order/waveOrder/component/PendingOrderListPanel.vue b/src/views/order/waveOrder/component/PendingOrderListPanel.vue
index acb5997d..4acde08a 100644
--- a/src/views/order/waveOrder/component/PendingOrderListPanel.vue
+++ b/src/views/order/waveOrder/component/PendingOrderListPanel.vue
@@ -215,7 +215,11 @@ const upperTable = ref(null)
const presetTree = ref([])
const availableFieldsRef = reactive(
- JSON.parse(JSON.stringify(pendingAvailableFields.filter((field: any) => field.value !== 'wave_no')))
+ JSON.parse(
+ JSON.stringify(
+ pendingAvailableFields.filter((field: any) => field.value !== 'wave_no' && field.value !== 'wave_scope')
+ )
+ )
)
const toolbarButtons = pickToolbarButtons(['refresh', 'columnConfig', 'allocateStorage', 'allocateExpress', 'manualWaybill', 'syncOrderIds'])
diff --git a/src/views/order/waveOrder/component/WaveBatchDetailPanel.vue b/src/views/order/waveOrder/component/WaveBatchDetailPanel.vue
index 12ed55f0..b99884ba 100644
--- a/src/views/order/waveOrder/component/WaveBatchDetailPanel.vue
+++ b/src/views/order/waveOrder/component/WaveBatchDetailPanel.vue
@@ -13,10 +13,25 @@
{{ getStatusText(row) }}
{{ row.warehouse_id ?? '—' }}
+ {{ row.total_orders ?? getOrderCount(row) }}
{{ getOrderCount(row) }}
{{ getProcessedOrders(row) }}
+ {{ row.logistics_code || '—' }}
{{ row.logistics_name || '—' }}
+
+
+ {{ Number(row?.distinguish_express) ? '是' : '否' }}
+
+
+
+
+ {{ formatWaveSource(row.source) }}
+
+
{{ row.creator || row.creator_name || '—' }}
+ {{ row.item_part_type || '—' }}
+ {{ row.item_part || '—' }}
+ {{ row.item_detail_machine || row.item_detail || '—' }}
@@ -38,21 +53,23 @@
{{ formatWavePrintAssignmentStatusLabel(row.print_assignment_status) }}
+
-
结构与订单信息
+
时间信息
- {{ getOrderInfoSummary(row) }}
- {{ getOrderListPreview(row) }}
{{ formatDateTime(row.create_time || row.created_at || row.create_at) }}
{{ formatDateTime(row.update_time || row.updated_at || row.update_at) }}
@@ -75,14 +92,15 @@
import { computed } from 'vue'
import {
waveStatusTextMap,
- waveStorageAssignmentErrorPhraseMap,
- waveStorageAssignmentErrorTextMap,
waveStorageAssignmentStatusTextMap,
waveTypeTextMap,
formatWaveExpressAssignmentStatusLabel,
+ formatWavePickAssignmentStatusLabel,
formatWavePrintAssignmentStatusLabel,
formatWaveReviewAssignmentStatusLabel,
- getWaveAssignmentAggregateTagType
+ formatWaveSource,
+ getWaveAssignmentAggregateTagType,
+ getWaveSourceTagType
} from '../config/wave-config'
const props = defineProps<{
@@ -168,70 +186,6 @@ function getStorageAssignmentStatusText(row: any) {
return text
}
-function translateStorageAssignmentErrorValue(value: unknown) {
- const text = String(value ?? '').trim()
- if (!text) return '—'
-
- const normalized = text.toLowerCase()
- if (waveStorageAssignmentErrorTextMap[normalized] !== undefined) {
- return waveStorageAssignmentErrorTextMap[normalized]
- }
-
- if (/[\u4e00-\u9fa5]/.test(text)) {
- return text
- }
-
- let translated = text.replace(/[_-]+/g, ' ')
- for (const [pattern, replacement] of waveStorageAssignmentErrorPhraseMap) {
- translated = translated.replace(pattern, replacement)
- }
-
- translated = translated.replace(/\s+/g, ' ').trim()
- return translated || text
-}
-
-function getStorageAssignmentError(row: any) {
- return translateStorageAssignmentErrorValue(
- row?.storage_assignment_error
- || row?.storage_assignment_exception
- || row?.storage_assignment_error_message
- || row?.storage_error
- || row?.storage_error_message
- || '—'
- )
-}
-
-function getOrderInfoSummary(row: any) {
- if (Array.isArray(row?.order_list) && row.order_list.length) {
- const preview = row.order_list
- .slice(0, 6)
- .map((item: any) => item.delivery_order_code || item.order_no || item.order_number || item.id)
- .filter(Boolean)
- return row.order_list.length > 6 ? `${preview.join(',')} 等 ${row.order_list.length} 单` : preview.join(',')
- }
- const info = row?.order_info || row?.order_summary || row?.orders_summary
- if (typeof info === 'string' && info.trim()) return info
- if (Array.isArray(info) && info.length) return info.join(',')
- if (Array.isArray(row?.orders) && row.orders.length) {
- return row.orders.map((item: any) => item.order_sn || item.order_no || item.order_number || item.id).filter(Boolean).join(',')
- }
- return '—'
-}
-
-function getOrderListPreview(row: any) {
- if (!Array.isArray(row?.order_list) || row.order_list.length === 0) {
- return '—'
- }
- return row.order_list
- .map((item: any) => {
- const code = item.delivery_order_code || item.order_no || item.order_number || item.id
- const storage = item.storage_status || '—'
- const post = item.post_status || '—'
- return `${code}(库位:${storage}, 快递:${post})`
- })
- .join(';')
-}
-
function formatDateTime(value: string | number | null | undefined) {
if (!value) return '—'
let normalizedValue: string | number = value
diff --git a/src/views/storage/productflow/productflow-config.ts b/src/views/storage/productflow/productflow-config.ts
index 2ce626a7..793fcab6 100644
--- a/src/views/storage/productflow/productflow-config.ts
+++ b/src/views/storage/productflow/productflow-config.ts
@@ -74,6 +74,8 @@ export const columns = [
{ prop: 'order_type', label: '订单类型', width: 100 },
{ prop: 'order_no', label: '订单号', minWidth: 160, copyAction: 'copy' as const },
{ prop: 'order_id', label: '订单ID', width: 90, copyAction: 'copy' as const },
+ { prop: 'receiving_id', label: '收货单ID', width: 100, copyAction: 'copy' as const },
+ { prop: 'entry_order_id', label: '入库单ID', width: 100, copyAction: 'copy' as const },
{ prop: 'operator_name', label: '操作人', width: 90 },
{ prop: 'remark', label: '备注', minWidth: 140 }
]