diff --git a/dist.tar.gz b/dist.tar.gz index 665b18b4..6091fd4e 100644 Binary files a/dist.tar.gz and b/dist.tar.gz differ diff --git a/src/views/order/waveOrder/WavePickTaskListPanel.vue b/src/views/order/waveOrder/WavePickTaskListPanel.vue index de558a2a..216390e5 100644 --- a/src/views/order/waveOrder/WavePickTaskListPanel.vue +++ b/src/views/order/waveOrder/WavePickTaskListPanel.vue @@ -26,7 +26,7 @@ />
- {{ pickTaskWaveListDefaults.toolbarHint }} +
@@ -149,14 +149,14 @@ @mousedown="beginSplitDrag" />
-
+
void> = { loadData: () => { void loadData() }, + openColumnConfigPanel: () => openColumnConfigPanel(), handleSearch: () => handleSearch(), handleBatchCancelTasks: () => { void handleBatchCancelTasks() } } +function openColumnConfigPanel() { + upperTable.value?.openColumnConfig?.() +} + function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) { const handler = toolbarActionMap[action] if (!handler) return diff --git a/src/views/order/waveOrder/config/wave-config.ts b/src/views/order/waveOrder/config/wave-config.ts index 867ee88f..f3b32d75 100644 --- a/src/views/order/waveOrder/config/wave-config.ts +++ b/src/views/order/waveOrder/config/wave-config.ts @@ -879,6 +879,7 @@ export const pickTaskWaveDetailDialogDefaults = { /** 拣货任务页工具栏按钮(action 与 WavePickTaskListPanel 内 toolbarActionMap 键一致) */ export const pickTaskWaveToolbarButtons: ToolbarButtonConfig[] = [ { key: 'refresh', label: '刷新', size: 'small', action: 'loadData' }, + { key: 'columnConfig', label: '字段设置', size: 'small', action: 'openColumnConfigPanel' }, { key: 'search', label: '查询', type: 'primary', size: 'small', action: 'handleSearch' }, { key: 'batchCancel', diff --git a/src/views/storage/entry/component/EntryBindingRelations.vue b/src/views/storage/entry/component/EntryBindingRelations.vue index 33610c5a..6111bf1b 100644 --- a/src/views/storage/entry/component/EntryBindingRelations.vue +++ b/src/views/storage/entry/component/EntryBindingRelations.vue @@ -74,8 +74,8 @@
对照预览 - - {{ comparePreview.receiving_number }} + + {{ comparePreviewReceivingNumber }}
@@ -190,6 +190,10 @@ const itemBindingRows = ref([]) const comparePreview = ref(null) const activeCompareReceivingId = ref(null) +const comparePreviewReceivingNumber = computed( + () => comparePreview.value?.comparisons?.[0]?.receiving_number ?? '' +) + const compareSummaryItems = computed(() => { const first = comparePreview.value?.comparisons?.[0] return buildReceivingCompareSummaryItems(first?.summary as Record | undefined) diff --git a/src/views/storage/entry/component/ReceivingCompareForm.vue b/src/views/storage/entry/component/ReceivingCompareForm.vue index 5e346803..0985be6b 100644 --- a/src/views/storage/entry/component/ReceivingCompareForm.vue +++ b/src/views/storage/entry/component/ReceivingCompareForm.vue @@ -100,7 +100,7 @@
行
收货单 - {{ compareResult.receiving_number || selectedReceivingNumber }} + {{ activeCompareReceivingNumber }}
@@ -276,6 +276,21 @@ const selectedReceivingNumber = computed( () => selectedReceiving.value?.receiving_number || (queryForm.receiving_id ? `#${queryForm.receiving_id}` : '—') ) +const activeCompareItem = computed(() => { + const comparisons = compareResult.value?.comparisons + if (!comparisons?.length) return null + const receivingId = queryForm.receiving_id + if (receivingId !== '') { + const matched = comparisons.find((item) => item.receiving_id === Number(receivingId)) + if (matched) return matched + } + return comparisons[0] +}) + +const activeCompareReceivingNumber = computed( + () => activeCompareItem.value?.receiving_number || selectedReceivingNumber.value +) + function getReceivingStatusText(item: ReceivingOption): string { return ( formatReceivingOrderStatusLabel(item.storage_status) || @@ -416,13 +431,13 @@ const diffRows = computed(() => { if (!compareResult.value) return [] const rows: DiffRow[] = [] - const comparison = compareResult.value.comparison ?? [] - comparison.forEach((row, index) => { + const comparison = activeCompareItem.value?.comparison ?? [] + comparison.forEach((row: ReceivingCompareRow, index: number) => { rows.push(buildDiffRow(row, index, 'cmp')) }) - const receivingOnly = compareResult.value.receiving_only ?? [] - receivingOnly.forEach((row, index) => { + const receivingOnly = activeCompareItem.value?.receiving_only ?? [] + receivingOnly.forEach((row: ReceivingCompareRow, index: number) => { rows.push(buildDiffRow(row, comparison.length + index, 'recv', true)) }) @@ -430,11 +445,15 @@ const diffRows = computed(() => { }) const summaryItems = computed(() => - buildReceivingCompareSummaryItems(compareResult.value?.summary as Record | undefined) + buildReceivingCompareSummaryItems( + (activeCompareItem.value?.summary ?? compareResult.value?.total_summary) as + | Record + | undefined + ) ) const summaryTag = computed(() => { - const summary = compareResult.value?.summary + const summary = activeCompareItem.value?.summary ?? compareResult.value?.total_summary if (!summary) return null if (summary.is_fully_matched === true || summary.fully_matched === true) { @@ -451,7 +470,7 @@ const summaryTag = computed(() => { const receivingOnly = Number( summary.receiving_only_items ?? summary.receiving_only_count ?? - (compareResult.value?.receiving_only?.length ?? 0) + (activeCompareItem.value?.receiving_only?.length ?? 0) ) if (!diffRows.value.length) {