This commit is contained in:
yin 2026-08-27 18:11:02 +08:00
parent 21d168cafc
commit b0512d3308
33 changed files with 1612 additions and 275 deletions

View File

@ -0,0 +1,191 @@
# 出库单批量打印 —— 商品明细分页设计
> 状态:已实施(2026-08-27)
> 日期:2026-08-27
> 相关页面:`storage/stockout` 批量打印出库单(`BatchReceivingPrintDialog.vue`)
> 相关模板:出库单A5模板(`template_18`,OUTBOUND,148mm × 210mm)
## 1. 背景与目标
批量打印出库单时,商品明细可能很多,且商品名称长短不一导致行高不固定。当前模板对「商品明细」表格不做任何分页/裁剪处理,内容一多就会**向下压过「备注」「打印时间」等固定元素,甚至溢出页面**。
**目标**:
- 商品明细表格内容到达「备注」位置(截止线)后,将剩余明细**自动拆分到第 2、3…N 页**打印。
- 分页数量**不按固定行数**,而是**按每行的实际渲染高度动态计算**。
- 打印台(`print.send`)与浏览器打印**两条通道都要支持**,且都采用**前端逐页发任务**的方式。
- 第 2 页起**重复单据头**,并通过单据头(出库单号)确认多页属于同一张出库单、同一批次。
## 2. 现状与问题定位
### 2.1 打印链路
```mermaid
flowchart LR
A[stockout/index.vue<br/>选择多张已完成出库单] --> B[BatchReceivingPrintDialog.vue]
B --> C[fetchPrintData<br/>获取单据头 + details 明细]
C --> D[预览 .preview-page 单页渲染]
C --> E[doPrint 打印台通道<br/>print.send customize]
C --> F[browserPrint 浏览器通道<br/>拷贝 preview-page 到新窗口]
```
- `doPrint()`:构造 `PrintSendCustomizeParams`(`type:'customize'` + `computerId` + `printer` + `template` + `data` + `count`),调用 `stationApi.sendPrint()`,由**打印台客户端**渲染。
- `browserPrint()`:把当前 `.preview-page` 的 `outerHTML` 写入新窗口后 `print()`。
- 两条通道目前都只能表达「一张单、一页」。
### 2.2 模板布局(出库单A5,148×210mm)
| 区域 | 元素 | top(mm) | 说明 |
|---|---|---|---|
| 单据头 | 出库单号/波次号/创建时间/快递公司/运单号/收件人/地址… | 4 ~ 74 | 每页要重复的部分 |
| 商品明细 | `table`(type=table) | 77 | 表头高 `headerHeight`=6,行高 `rowHeight`=6 |
| 截止线 | 分割线 / **备注** | 154 / **158** | 表格不得越过此线 |
| 页脚 | 打印时间 | 166 | 仅最后一页显示 |
表格列:商品编码 `item_code`(22) / 商品名称 `item_name`(40) / 数量 `plan_qty`(18) / 单价 `actual_price`(20) / 明细备注 `detail_remark`(28),合计 128mm。
### 2.3 问题根因
- `computePreviewItemStyle()` 对 `type==='table'` 设置 `width/height: auto`,表格高度完全由 `details` 行数 + 每行实际换行高度决定,**不裁剪、不分页**。
- 表格 `top=77`、截止线 `158`,单页数据区可用高度固定 ≈ `158 − 77 − 6 = 75mm`。
- 行高不固定:商品名称列宽 40mm、字号约 3mm(≈13 字/行),名称超长换行后该行高度 = `换行行数 × rowHeight`,所以**不能按固定行数拆页**。
## 3. 总体方案
**核心思路:前端按「实际渲染高度」动态切分明细 → 一张出库单生成多页 → 前端逐页发送(打印台逐次 sendPrint / 浏览器逐页渲染)→ 每页带完整单据头。**
```mermaid
flowchart TD
A[打印队列中取一张出库单] --> B[准备: 定位 table 与截止线<br/>tableTop=77 header=6 cutline=158]
B --> C[逐行计算实际高度 h_i<br/>估算: ceil(text/colWidth) x rowHeight]
C --> D[累加, 达到截止线则切页]
D --> E[每页生成独立 template_content + data]
E --> F{打印通道}
F -->|打印台| G[逐页调用 print.send<br/>type=customize count=1]
F -->|浏览器| H[逐页渲染 .preview-page<br/>拼接 + 强制分页]
G --> I[全部页完成 → 队列下一张单]
H --> I
```
### 3.1 关键参数(出库单A5)
```
tableTop = table.top // 77
headerH = table.headerHeight // 6
cutlineTop = 158 // 备注 top(截止线,不遮挡备注)
usableH = cutlineTop - tableTop - headerH // = 75mm(第1页)
```
- **第 1 页**:单据头完整 + 表格(重复表头)+ 截止线下方的备注、打印时间。
- **第 2…N 页**:**重复单据头**(`top < tableTop` 的模板元素)+ 表格(重复表头)+ 页码标识;备注、打印时间等页脚元素**仅最后一页**保留。
- 第 2+ 页的 `usableH` 与第 1 页一致(因为重复单据头后,表格仍从 77 开始,截止线仍为 158)。
### 3.2 动态行高计算
**推荐:估算法(快、无 DOM 开销)**
```
perLineH = rowHeight(6)
cols: 每列 { width, field }
行高 = max over 列 of ( ceil( 文本宽度 / 列宽 ) ) × perLineH
文本宽度 = 估算字符数 × 字宽(中文≈fontSize,ASCII≈0.5×fontSize)
```
**备选:测量法(更准)**
- 在隐藏 DOM 中按模板列宽/字号渲染该行,读取 `scrollHeight` 换算成 mm 累加。
- 成本高,仅当估算误差影响分页正确性时启用。
### 3.3 页面模板内容生成
对每个拆出的页 `P`:
```ts
// 第1页(多页时也加页码)
pageTemplateContent(P0) = [
...单头元素(top<77),
table元素(表头 + P0 的行),
...页脚元素(备注 top=158 / 打印时间 top=166),
页码 text 元素, // "第 1/N 页"
]
// 第2..N页
pageTemplateContent(Pk) = [
...单头元素(top<77), // 重复单据头
table元素(表头 + Pk 的行),
页码 text 元素, // 如 "第 2/3 页",可用自定义 text,无 field_code
]
```
> 页码仅在多页(N>1)时追加,第 1 页同样有;单页场景保持原模板不加页码。
> 表格元素的 `rows`(表头列定义)保持不变,仅数据行 `details` 切片不同。
### 3.4 每页 data
```
pageData = {
...formData, // 单据头字段完整(含 delivery_order_code 出库单号)
details: details.slice(页起始行, 页结束行),
pageNo: k, // 第几页
pageTotal: N, // 共几页
}
```
> 通过单据头字段(出库单号 + 收件人等)确认多页属于同一张单;批量队列中多张单按出库单号区分批次。
## 4. 打印台通道(doPrint)
改造后逐页发送:
```ts
for (const page of pages) {
const payload: PrintSendCustomizeParams = {
type: 'customize',
computerId: printSettings.station,
printer: printSettings.printer,
template: { ...template, template_content: page.templateContent },
data: page.data,
timestamp: String(Date.now()),
count: 1,
}
await stationApi.sendPrint(payload) // 每页一次任务,顺序等待
}
```
- 一张单的 N 页全部成功后再打印队列中的下一张单。
- 进度提示:`打印队列 (M)` 按单据计数;当前页提示「出库单号 xxx (第 k/N 页)」。
- 失败处理:单页失败记录该单据为 `error`,允许补打(沿用现有 `printStatusMap`)。
## 5. 浏览器通道(browserPrint)
改造后逐页渲染:
- 一张单生成 N 个 `.preview-page`(每页内容与打印台一致),拼接写入打印窗口。
- 页与页之间强制分页:`@page { size: 148mm 210mm; margin: 0 }` + 每个 `.preview-page` 之间 `page-break-after: always`。
- 图片(条码/二维码)加载完成后再 `print()`(沿用现有逻辑)。
## 6. 单据头与批次确认
- **每页都重复单据头**:出库单号(`delivery_order_code`)、收件人、地址、物流等 `top<77` 的元素。
- 多页时每页右下角渲染页码(`第 k/N 页`,**含第 1 页**),便于纸质面单归档时确认页序与归属。
- 批量队列 = 多张出库单 = 多个批次;同单多页通过「出库单号」归属同一批次。
## 7. 涉及改动点
| 文件 | 改动 |
|---|---|
| `src/components/BatchReceivingPrintDialog.vue` | ① 新增分页计算(定位 table/截止线、动态行高、切分 details)② `doPrint` 逐页发送 ③ `browserPrint` 逐页渲染 + 强制分页 ④ 页码/进度展示 |
| `src/utils/printPaginate.ts`(新增,建议) | 抽公共分页工具:`paginateDetails(template, details) → Page[]`,供打印台/浏览器复用 |
| `src/views/storage/stockout/index.vue` | `fetchPrintData` 补充单据头字段映射(`delivery_order_code`/`wave_no`/`logistics_name` 等模板字段与 `stockout_order_code` 数据的对齐),确保第 2+ 页单据头有值 |
## 8. 实施前需核对
1. **字段映射**:模板出库单号 `field_code=delivery_order_code`,而 stockout 数据为 `stockout_order_code`,需确认打印取值是否已正确映射(`getPreviewValue` 按 `field_code` 直取)。
2. **打印台渲染行为**:`print.send` 的 `template.template_content` 是否严格按 `top/left/width/height` 绝对定位渲染第 2+ 页模板(依赖打印台客户端,需联调验证)。
3. **截止线取值**:目前取备注 `top=158`,若后续模板编辑改动布局,分页参数应改为**运行时从模板读取**(取 `table` 下方第一个非表格元素的 top),而不是硬编码。
4. **留白策略**:第 1 页表格只到 158mm,页面下方(158~210)仍保留备注/打印时间,符合「不遮挡备注」要求;如需减少留白可后续再调截止线策略。
## 9. 验收标准
- 商品明细少(表格不越 158)时:仍为单页,行为与现状一致。
- 商品明细多(越 158)时:自动拆分多页;第 2+ 页重复单据头与表头;每页均不遮挡备注。
- 商品名称长短变化:每页行数随之动态变化,总页数正确。
- 打印台与浏览器两条通道分页结果一致。
- 批量多张单:逐张、逐页按序打印,出库单号可区分批次与页序。

1
out.txt Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -167,6 +167,12 @@ export type OrderExportParams = {
/** 导出模式,默认 waybill */
export_mode?: OrderExportMode
exportMode?: OrderExportMode
/**
* 导出表头字段白名单(中文表头字符串数组,如 ["系统订单号","外部订单号"]);不传或空数组时输出全部列。
* 支持 export_columns 与 exportColumns 两种写法。
*/
export_columns?: string[]
exportColumns?: string[]
}
export type OrderExportTaskProgressParams = {

View File

@ -5,8 +5,12 @@ const v = '1.0'
/** order.wave.batchList 的 where 白名单(禁止 warehouse_id / warehouseId) */
export type WaveBatchListWhere = {
wave_id?: number | string
/** 货主(店铺)ID 筛选 */
store_id?: number | string
/** 货主(店铺)ID 筛选;支持单值/数组/{ operator, value } 结构 */
store_id?:
| number
| string
| Array<number | string>
| { operator?: string; value: number | string | Array<number | string> }
wave_no?: string
wave_type?: number
wave_status?: number
@ -67,6 +71,8 @@ export type WaveBatchListItem = Record<string, unknown> & {
source?: number
review_assignment_status?: string
unreviewed_order_count?: number
/** 货主信息:波次内所有订单均为同一货主时返回货主名称,否则返回“混合” */
store_name?: string
}
export type WaveBatchListResponse = {

View File

@ -143,6 +143,10 @@ export type EntryDetailItem = {
warehouse_item_name?: string
warehouse_item_spec?: string
count?: number
/** 计划数量(storage.entry.get items 实际返回字段) */
planned?: number
/** 已完成数量(storage.entry.get items 实际返回字段) */
completed?: number
received_quantity?: number
confirm_quantity?: number
warehouse_quantity?: number | null
@ -187,6 +191,10 @@ export type EntryOrderDetail = {
store_name?: string
store_remask?: string
order_status?: string
/** 商品类型总数 */
total_order_lines?: number
/** 商品总数 */
total_quantity?: number
items?: EntryDetailItem[]
receivingBindings?: EntryOrderReceivingBinding[]
/** 入库单级导入/PDA 记录汇总(若后端返回) */
@ -200,6 +208,10 @@ export type GetEntryDetailResponse = {
entryOrder?: EntryOrderDetail
data?: {
entryOrder?: EntryOrderDetail
/** 商品总数(接口在 entryOrder 外层返回时读取此字段) */
total_quantity?: number
/** 已收数量 */
received_quantity?: number
items?: EntryDetailItem[]
receivingBindings?: EntryOrderReceivingBinding[]
}

View File

@ -11,6 +11,8 @@ export type ReplenishmentDemandSortField =
| 'replenishment_needed'
export interface ReplenishmentDemandBody {
/** 货主筛选:支持单值或数组(正整数),不传返回全部货主 */
store_id?: number | string | Array<number | string>
pagination?: {
page?: number
pageSize?: number
@ -30,6 +32,9 @@ export function getReplenishmentDemand(data?: ReplenishmentDemandBody): Promise<
const body: Record<string, unknown> = {
pagination: data?.pagination ?? { page: 1, pageSize: 20 },
}
if (data?.store_id !== undefined && data?.store_id !== null && data?.store_id !== '') {
body.store_id = data.store_id
}
if (data?.sort) {
body.sort = data.sort
}

View File

@ -43,58 +43,64 @@
<div class="print-preview-main__content">
<div class="print-canvas-area">
<div
v-if="previewInfo.width && previewInfo.height"
class="preview-page"
:style="{ width: previewInfo.width + 'mm', height: previewInfo.height + 'mm', position: 'relative' }"
>
<div v-for="(item, idx) in previewObjects" :key="item.id" :style="computePreviewItemStyle(item, idx)">
<template v-if="item.type === 'text'">
<span>{{ getPreviewValue(item) }}</span>
</template>
<template v-else-if="item.type === 'barcode'">
<barcode-img :text="getPreviewValue(item) || '0123456789'" />
</template>
<template v-else-if="item.type === 'qrcode'">
<qrcode-img :text="getPreviewValue(item) || ''" />
</template>
<template v-else-if="item.type === 'image'">
<img :src="item.content" alt="" style="width: 100%; height: 100%; object-fit: fill;" />
</template>
<template v-else-if="item.type === 'table'">
<table style="border: 1px solid #000; border-collapse: collapse;" border="1" cellspacing="0" cellpadding="0" width="100%" height="auto">
<thead>
<tr>
<td
v-for="c in item.rows"
:key="c.id"
:style="{ width: c.width + 'mm', fontSize: '3mm', textAlign: 'center', border: '1px solid #000', height: (item.headerHeight || 4) + 'mm' }"
<template v-if="previewInfo.width && previewInfo.height && currentPages.length">
<div
v-for="(page, pIdx) in currentPages"
:key="'page-' + pIdx"
class="preview-page"
:style="{ width: previewInfo.width + 'mm', height: previewInfo.height + 'mm', position: 'relative' }"
>
<div v-for="(item, idx) in page.templateContent" :key="item.id + '_' + pIdx" :style="computePreviewItemStyle(item, idx)">
<template v-if="item.type === 'text'">
<span>{{ getPreviewValue(item, page.data) }}</span>
</template>
<template v-else-if="item.type === 'barcode'">
<barcode-img :text="getPreviewValue(item, page.data) || '0123456789'" />
</template>
<template v-else-if="item.type === 'qrcode'">
<qrcode-img :text="getPreviewValue(item, page.data) || ''" />
</template>
<template v-else-if="item.type === 'image'">
<img :src="item.content" alt="" style="width: 100%; height: 100%; object-fit: fill;" />
</template>
<template v-else-if="item.type === 'table'">
<table style="border: 1px solid #000; border-collapse: collapse;" border="1" cellspacing="0" cellpadding="0" width="100%" height="auto">
<thead>
<tr>
<td
v-for="c in item.rows"
:key="c.id"
:style="{ width: c.width + 'mm', fontSize: '3mm', textAlign: 'center', border: '1px solid #000', height: (item.headerHeight || 4) + 'mm' }"
>
{{ c.title }}
</td>
</tr>
</thead>
<tbody>
<tr
v-for="(detailItem, dIdx) in (page.data.details && page.data.details.length ? page.data.details : [page.data])"
:key="dIdx"
>
{{ c.title }}
</td>
</tr>
</thead>
<tbody>
<tr
v-for="(detailItem, dIdx) in (printForm.details && printForm.details.length ? printForm.details : [printForm])"
:key="dIdx"
>
<td
v-for="c in item.rows"
:key="c.id + '_v'"
:style="{ fontSize: '3mm', textAlign: 'center', border: '1px solid #000', height: (item.rowHeight || 4) + 'mm' }"
>
{{ detailItem[c.field_code] || '' }}
</td>
</tr>
</tbody>
</table>
</template>
<template v-else-if="item.type === 'shape'">
<div style="width: 100%; height: 100%;" />
</template>
<td
v-for="c in item.rows"
:key="c.id + '_v'"
:style="{ fontSize: '3mm', textAlign: 'center', border: '1px solid #000', height: (item.rowHeight || 4) + 'mm' }"
>
{{ detailItem[c.field_code] || '' }}
</td>
</tr>
</tbody>
</table>
</template>
<template v-else-if="item.type === 'shape'">
<div style="width: 100%; height: 100%;" />
</template>
</div>
<div v-if="currentPages.length > 1" class="preview-page-label">
{{ page.pageNo }} / {{ page.pageTotal }}
</div>
</div>
</div>
</template>
<div v-else class="preview-empty">
<el-empty description="请在上方选择打印模板" :image-size="60" />
</div>
@ -128,6 +134,7 @@ import * as templateApi from '@/api/setting.printtemplate/printTemplate'
import * as stationApi from '@/api/print/print'
import type { PrintSendParams } from '@/api/print/print'
import { printFormConfig } from '@/views/storage/receiving/receiving-config'
import { paginatePrintTemplate, type PrintPageItem } from '@/utils/printPaginate'
type RowItem = {
id: string | number
@ -169,6 +176,8 @@ const printing = ref(false)
const currentPrintIndex = ref(0)
const printStatusMap = ref<Record<string | number, string>>({})
const printForm = reactive<any>({})
/** 当前单据按模板分页后的页面集合(第 1 页原样,第 2+ 页重复单据头) */
const currentPages = ref<PrintPageItem[]>([])
const printSettings = reactive({
businessType: 'RECEIPT',
station: '' as string | number,
@ -230,11 +239,17 @@ const previewInfo = computed(() => {
return { width: t.page_width || 0, height: t.page_height || 0 }
})
const previewObjects = computed(() => {
/** 按当前模板 + 当前单据数据计算分页结果 */
function refreshPages() {
const t = templateOptions.value.find((item: any) => item.id === printSettings.template)
if (!t || !Array.isArray(t.template_content)) return []
return t.template_content
})
currentPages.value = paginatePrintTemplate(t || {}, printForm)
}
// 切换打印模板时重新分页
watch(
() => printSettings.template,
() => refreshPages()
)
const completedPrintCount = computed(() => {
return Object.values(printStatusMap.value).filter(s => s === 'done').length
@ -315,19 +330,19 @@ function _fmtISODate(val: string): string {
}
}
function getPreviewValue(item: any): string {
// 有 field_code 时优先从 printForm 取值
function getPreviewValue(item: any, data?: any): string {
const form = data ?? printForm
// 有 field_code 时优先从 form 取值
if (item.field_code) {
// 处理 suffix_fields:将主字段 + 后缀字段拼接
if (Array.isArray(item.suffix_fields) && item.suffix_fields.length > 0) {
const parts: string[] = []
const mainVal = printForm[item.field_code]
const mainVal = form[item.field_code]
if (mainVal !== undefined && mainVal !== null && String(mainVal).trim() !== '') {
parts.push(String(mainVal).trim())
}
item.suffix_fields.forEach((sf: string) => {
const sv = printForm[sf]
const sv = form[sf]
if (sv !== undefined && sv !== null && String(sv).trim() !== '') {
parts.push(String(sv).trim())
}
@ -339,7 +354,7 @@ function getPreviewValue(item: any): string {
}
// 普通字段取值
const raw = printForm[item.field_code]
const raw = form[item.field_code]
if (raw !== undefined && raw !== null && String(raw).trim() !== '') {
const val = String(raw)
// 时间字段自动格式化 ISO → YYYY-MM-DD HH:mm:ss
@ -351,21 +366,20 @@ function getPreviewValue(item: any): string {
// express_code / waybill_code 为空时尝试多来源回退
if (item.field_code === 'express_code' || item.field_code === 'waybill_code') {
// 1) 交叉回退:express_code ↔ waybill_code(两个字段在 printForm 顶层互换取值)
// 1) 交叉回退:express_code ↔ waybill_code(两个字段在 form 顶层互换取值)
const peerField = item.field_code === 'express_code' ? 'waybill_code' : 'express_code'
const peerVal = printForm[peerField]
const peerVal = form[peerField]
if (peerVal !== undefined && peerVal !== null && String(peerVal).trim() !== '') {
return String(peerVal).trim()
}
console.log("printForm",JSON.stringify(printForm));
// 2) 先试 expresses 数组
const expresses = printForm.expresses
const expresses = form.expresses
if (Array.isArray(expresses) && expresses.length > 0) {
const code = expresses[0]?.waybill_code || expresses[0]?.express_code
if (code) return String(code)
}
// 3) 再试 details 中第一条的 expresses
const details = printForm.details
const details = form.details
if (Array.isArray(details) && details.length > 0) {
const firstDetail = details[0]
if (firstDetail) {
@ -452,6 +466,7 @@ async function loadPrintFormData(index: number) {
const formData = await props.fetchPrintData(mainRow, index)
Object.keys(printForm).forEach(key => delete printForm[key])
Object.assign(printForm, formData || {})
refreshPages()
} catch (e) {
console.error('加载打印数据失败', e)
Object.keys(printForm).forEach(key => delete printForm[key])
@ -543,6 +558,7 @@ async function loadPrintFormData(index: number) {
Object.keys(printForm).forEach(key => delete printForm[key])
Object.assign(printForm, formData)
refreshPages()
}
async function loadPrintOptions() {
@ -666,43 +682,60 @@ async function doPrint() {
try {
const selectedTemplateObj = templateOptions.value.find((item: any) => item.id === printSettings.template) || null
const printPayload: PrintSendParams = {
type: 'customize',
computerId: String(printSettings.station),
printer: printSettings.printer,
template: (selectedTemplateObj || {}) as Record<string, unknown>,
data: { ...printForm } as Record<string, unknown>,
timestamp: String(Date.now()),
count: 1
// 逐页发送:当前单据按模板分页,每页一个打印任务(第 2+ 页重复单据头)
const pages = currentPages.value.length > 0 ? currentPages.value : [
{
pageNo: 1,
pageTotal: 1,
templateContent: Array.isArray(selectedTemplateObj?.template_content) ? selectedTemplateObj.template_content : [],
data: { ...printForm },
detailStart: 0,
detailEnd: Array.isArray(printForm.details) ? printForm.details.length : 0
}
]
for (const page of pages) {
const printPayload: PrintSendParams = {
type: 'customize',
computerId: String(printSettings.station),
printer: printSettings.printer,
template: {
...(selectedTemplateObj || {}),
template_content: page.templateContent
} as Record<string, unknown>,
data: { ...page.data } as Record<string, unknown>,
timestamp: String(Date.now()),
count: 1
}
const res: any = await stationApi.sendPrint(printPayload)
if (!(res && (res.code === 0 || res.code === 200 || res.status === 'success' || res.flag === 'success'))) {
throw new Error(res?.msg || res?.message || `${props.documentLabel} ${getQueueNumber(currentRow)} 打印失败`)
}
}
const res: any = await stationApi.sendPrint(printPayload)
if (res && (res.code === 0 || res.code === 200 || res.status === 'success' || res.flag === 'success')) {
printStatusMap.value[currentRow.id] = 'done'
ElMessage.success(`${props.documentLabel} ${getQueueNumber(currentRow)} 打印成功`)
// 全部页打印成功
printStatusMap.value[currentRow.id] = 'done'
const pageTip = pages.length > 1 ? `(共 ${pages.length} 页)` : ''
ElMessage.success(`${props.documentLabel} ${getQueueNumber(currentRow)} 打印成功${pageTip}`)
if (currentPrintIndex.value < props.selectionRows.length - 1) {
currentPrintIndex.value++
await loadPrintFormData(currentPrintIndex.value)
} else {
ElMessage.info('已完成所有选中单据的打印操作')
}
if (currentPrintIndex.value < props.selectionRows.length - 1) {
currentPrintIndex.value++
await loadPrintFormData(currentPrintIndex.value)
} else {
printStatusMap.value[currentRow.id] = 'error'
ElMessage.error(res?.msg || res?.message || `${props.documentLabel} ${getQueueNumber(currentRow)} 打印失败`)
ElMessage.info('已完成所有选中单据的打印操作')
}
} catch (e) {
console.error('打印出错:', e)
printStatusMap.value[currentRow.id] = 'error'
ElMessage.error('打印请求失败,请检查网络或打印台状态')
ElMessage.error((e as Error)?.message || '打印请求失败,请检查网络或打印台状态')
} finally {
printing.value = false
}
}
function browserPrint() {
const previewEl = document.querySelector('.preview-page') as HTMLElement | null
if (!previewEl) {
const previewEls = document.querySelectorAll('.preview-page') as NodeListOf<HTMLElement>
if (!previewEls.length) {
ElMessage.warning('暂无预览内容可打印')
return
}
@ -715,12 +748,33 @@ function browserPrint() {
let styleHtml = ''
styles.forEach(s => { styleHtml += s.outerHTML })
// 拼接当前单据的所有分页(第 1..N 页),每页强制分页
const pagesHtml = Array.from(previewEls)
.map(el => el.outerHTML)
.join('')
printWindow.document.write(`
<!DOCTYPE html>
<html>
<head><meta charset="utf-8"><title>打印预览</title>${styleHtml}</head>
<body style="margin:0;display:flex;justify-content:center;">
${previewEl.outerHTML}
<head>
<meta charset="utf-8">
<title>打印预览</title>
${styleHtml}
<style>
@page { size: ${previewInfo.value.width}mm ${previewInfo.value.height}mm; margin: 0; }
html, body { margin: 0; padding: 0; }
body { display: flex; flex-direction: column; align-items: center; }
.preview-page {
page-break-after: always;
box-shadow: none !important;
border: none !important;
}
.preview-page:last-child { page-break-after: auto; }
.preview-page-label { display: none !important; }
</style>
</head>
<body>
${pagesHtml}
</body>
</html>
`)
@ -853,8 +907,9 @@ function browserPrint() {
.print-canvas-area {
display: flex;
justify-content: center;
align-items: flex-start;
flex-direction: column;
align-items: center;
gap: 20px;
padding: 20px;
background-color: #f0f2f5;
@ -863,6 +918,18 @@ function browserPrint() {
box-shadow: 0 2px 12px rgba(0, 0, 0, 0.15);
border: 1px solid #ddd;
flex-shrink: 0;
.preview-page-label {
position: absolute;
right: 4px;
top: 2px;
color: #c0c4cc;
font-size: 10px;
z-index: 99;
background: rgba(255, 255, 255, 0.8);
padding: 0 4px;
border-radius: 3px;
}
}
.preview-empty {

View File

@ -477,6 +477,7 @@
</div>
<!-- 数字类型 -->
<div v-else-if="field.type === 'number'" class="compact-field-item">
<span class="compact-field-label">{{ field.label }}</span>
<div v-if="getOperators(field).length > 1" class="compact-field-control">
<el-select
v-model="customConditions[field.value].operator"
@ -2087,6 +2088,11 @@ defineExpose({ getConditions, reset, clear, getFieldDraft, setFieldCondition, su
min-height: 28px;
}
/* 紧凑模式下拉选择:高度对齐输入框 */
.compact-field-item :deep(.el-select__wrapper) {
min-height: 28px;
}
/* 紧凑模式文本字段:操作符选择 + 输入框并排 */
.compact-field-control {
display: flex;

View File

@ -471,7 +471,7 @@ const props = defineProps({
// 分页每页显示个数选择器的选项设置
pageSizes: {
type: Array as any,
default: () => [10, 20, 50, 100, 200, 500, 1000],
default: () => [10, 20, 50, 100, 200, 500],
},
// 分页布局
paginationLayout: {

View File

@ -17,6 +17,9 @@ export type OrderAsyncExportPayload = {
sort?: Record<string, unknown>
export_mode?: OrderExportMode
exportMode?: OrderExportMode
/** 导出表头字段白名单(中文表头字符串数组);不传或空数组时输出全部列 */
export_columns?: string[]
exportColumns?: string[]
}
export function useOrderAsyncExport(storageKey?: string) {

197
src/utils/printPaginate.ts Normal file
View File

@ -0,0 +1,197 @@
/**
* 打印模板分页工具
*
* 用于把一张单据的「商品明细」按模板布局拆分为多页:
* - 定位模板中的 table(商品明细)与下方「截止线」(默认取表格之后最近的 text 元素 top,即备注位置)
* - 按每行实际渲染高度(商品名称换行会抬高行高)动态切分,而非固定行数
* - 第 2+ 页重复单据头(top < tableTop 的元素)+ 重复表头 + 页码
*
* 打印台通道(print.send)与浏览器打印共用此逻辑,保证两通道分页一致。
*/
export interface PrintPageItem {
/** 第几页(从 1 开始) */
pageNo: number
/** 总页数 */
pageTotal: number
/** 该页模板内容(第 1 页为原模板;第 2+ 页为单头 + 表格 + 页码) */
templateContent: Record<string, any>[]
/** 该页数据(单据头字段完整 + details 切片 + pageNo/pageTotal) */
data: Record<string, any>
/** 该页明细在原始 details 中的起始下标(含) */
detailStart: number
/** 该页明细在原始 details 中的结束下标(不含) */
detailEnd: number
}
export interface PaginatePrintOptions {
/** 截止线(mm),默认自动取表格之后最近的 text 元素 top */
cutlineTop?: number
/** 单元格字号(mm),用于估算文本换行,默认 3 */
cellFontSizeMm?: number
/** 每行基准高度(mm),默认取 table.rowHeight || 6 */
perLineHeight?: number
/** 是否给第 2+ 页追加页码元素,默认 true */
appendPageLabel?: boolean
}
/** 中日韩/全角字符按 1 个宽度单位,其余按 0.5 个单位(近似) */
function displayUnits(text: string): number {
let units = 0
for (const ch of String(text ?? '')) {
const code = ch.codePointAt(0) ?? 0
if (code >= 0x2e80 || code === 0x3000) {
units += 1
} else {
units += 0.5
}
}
return units
}
/**
* 估算单行实际高度:
* 对每一列,按「文本显示宽度 / 列宽」换行,取所有列的最大行数 × 基准行高。
*/
function estimateRowHeight(
detail: Record<string, any>,
table: Record<string, any>,
cellFontSizeMm: number,
perLineHeight: number
): number {
const cols: any[] = Array.isArray(table.rows) ? table.rows : []
let maxLines = 1
for (const col of cols) {
const colWidth = Number(col.width) || 10
const value = detail?.[col.field_code]
if (value === undefined || value === null || String(value).trim() === '') continue
// 每行可容纳的「中文宽度单位」数:列宽 / 字号
const capacity = Math.max(1, colWidth / Math.max(0.1, cellFontSizeMm))
const lines = Math.max(1, Math.ceil(displayUnits(String(value)) / capacity))
maxLines = Math.max(maxLines, lines)
}
return maxLines * perLineHeight
}
/** 第 2+ 页追加的页码元素(自定义 text,无 field_code,content 直接显示) */
function buildPageLabel(template: Record<string, any>, pageNo: number, pageTotal: number) {
const pageWidth = Number(template?.page_width) || 148
const pageHeight = Number(template?.page_height) || 210
return {
id: `page_label_${pageNo}`,
top: Math.max(0, pageHeight - 8),
left: Math.max(0, pageWidth - 46),
type: 'text',
width: 42,
height: 6,
fontSize: 8,
content: `第 ${pageNo}/${pageTotal} 页`,
textAlign: 'right',
lineHeight: 6
}
}
/**
* 按模板布局把单据分页。
* - 模板中没有 table 或没有明细 → 返回单页原样,行为与现状一致。
* - 有 table 且明细溢出 → 自动拆分多页。
*/
export function paginatePrintTemplate(
template: Record<string, any>,
formData: Record<string, any>,
options: PaginatePrintOptions = {}
): PrintPageItem[] {
const content: any[] = Array.isArray(template?.template_content) ? template.template_content : []
const table = content.find(el => el?.type === 'table')
const details: any[] = Array.isArray(formData?.details) ? formData.details : []
if (!table || details.length === 0) {
return [
{
pageNo: 1,
pageTotal: 1,
templateContent: content,
data: { ...formData, details, pageNo: 1, pageTotal: 1 },
detailStart: 0,
detailEnd: details.length
}
]
}
const tableTop = Number(table.top) ?? 0
const headerH = Number(table.headerHeight ?? 4)
const perLineHeight = options.perLineHeight ?? Number(table.rowHeight ?? 6)
const cellFontSizeMm = options.cellFontSizeMm ?? 3
// 截止线:参数优先;否则取表格之后最近的 text 元素 top(如备注位置)
const optionCutline = options.cutlineTop
let cutlineTop: number
if (optionCutline === undefined || optionCutline === null) {
const afterTexts = content
.filter(el => el !== table && el?.type === 'text' && Number(el.top) > tableTop)
.map(el => Number(el.top))
.filter(n => Number.isFinite(n))
.sort((a, b) => a - b)
cutlineTop = afterTexts.length > 0 ? (afterTexts[0] as number) : tableTop + (Number(table.height) || 75)
} else {
cutlineTop = optionCutline
}
const usableH = cutlineTop - tableTop - headerH
// 第一遍:按实际行高动态切分(不按固定行数)
const pageRowSets: any[][] = []
let curRows: any[] = []
let curH = 0
for (const detail of details) {
const rowH = estimateRowHeight(detail, table, cellFontSizeMm, perLineHeight)
if (curRows.length > 0 && curH + rowH > usableH) {
pageRowSets.push(curRows)
curRows = []
curH = 0
}
curRows.push(detail)
curH += rowH
}
if (curRows.length > 0 || pageRowSets.length === 0) {
pageRowSets.push(curRows)
}
// 第二遍:生成每页模板内容与数据
const total = pageRowSets.length
const result: PrintPageItem[] = []
let idx = 0
pageRowSets.forEach((rows, i) => {
const pageNo = i + 1
const detailStart = idx
const detailEnd = idx + rows.length
idx = detailEnd
let pageContent = content
if (pageNo > 1) {
// 第 2+ 页:重复单据头(top < tableTop)+ 表格(重复表头)
const head = content.filter(el => Number(el.top) < tableTop)
pageContent = [...head, table]
}
// 多页时每页右下角都追加页码(第 1 页同样加,便于确认页序与批次)
if (total > 1 && options.appendPageLabel !== false) {
pageContent = [...pageContent, buildPageLabel(template, pageNo, total)]
}
result.push({
pageNo,
pageTotal: total,
templateContent: pageContent,
data: {
...formData,
details: rows,
pageNo,
pageTotal: total
},
detailStart,
detailEnd
})
})
return result
}

View File

@ -113,6 +113,14 @@
</div>
</div>
<order-export-columns-dialog
v-model:visible="exportColumnsDialogVisible"
:mode="exportColumnsMode"
:loading="exportColumnsLoading"
:storage-key="exportColumnsStorageKey"
@confirm="confirmExportColumns"
/>
<order-export-progress-dialog
v-model:visible="exportDialogVisible"
:loading="exportLoading"
@ -150,6 +158,7 @@ import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue'
import ExpressWaybillPanel from './component/ExpressWaybillPanel.vue'
import log from './component/log.vue'
import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue'
import OrderExportColumnsDialog from './component/OrderExportColumnsDialog.vue'
import { createOrderPageExport } from './utils/order-page-export'
import { buildOrderWhereConditions, parseOrderListResponse } from './utils/order-index-helpers'
import { useOrderListPageCleanup } from './utils/use-order-list-page-cleanup'
@ -296,7 +305,14 @@ const {
handleExport,
handleExportWaybill,
handleExportItem,
handleExportSelection
handleExportSelection,
handleExportSelectionWaybill,
handleExportSelectionItem,
exportColumnsDialogVisible,
exportColumnsMode,
exportColumnsLoading,
exportColumnsStorageKey,
confirmExportColumns
} = pageExport
async function loadFilterData() {
@ -382,6 +398,8 @@ const { actionMap: toolbarActionMap } = createSimpleListToolbarController({
handleExportWaybill,
handleExportItem,
handleExportSelection,
handleExportSelectionWaybill,
handleExportSelectionItem,
openColumnConfigPanel,
toggleDetailVisible
})

View File

@ -0,0 +1,332 @@
<template>
<el-dialog
:model-value="visible"
:title="dialogTitle"
width="720px"
align-center
destroy-on-close
class="order-export-columns-dialog"
@update:model-value="(v: boolean) => emit('update:visible', v)"
>
<div class="export-columns-dialog">
<div class="export-columns-tip">
勾选需要导出的字段,未勾选的字段将不出现在导出文件中。
</div>
<!-- 顶部工具条:搜索 + 全选/反选/清空 -->
<div class="export-columns-toolbar">
<el-input
v-model="keyword"
placeholder="搜索字段"
clearable
size="small"
class="export-columns-search"
>
<template #prefix>
<el-icon><Search /></el-icon>
</template>
</el-input>
<el-checkbox
:model-value="isAllSelected"
:indeterminate="isIndeterminate"
@change="handleToggleAll"
>
全选
</el-checkbox>
<el-button link type="primary" @click="handleReverse">反选</el-button>
<el-button link type="danger" @click="handleClear">清空</el-button>
<span class="export-columns-count">已选 {{ selected.length }} / {{ totalColumnCount }}</span>
</div>
<!-- 分组字段列表 -->
<div class="export-columns-groups">
<div
v-for="group in visibleGroups"
:key="group.name"
class="export-columns-group"
>
<div class="export-columns-group-title">
<span class="export-columns-group-name">{{ group.name }}</span>
<el-checkbox
size="small"
:model-value="isGroupSelected(group.name)"
:indeterminate="isGroupIndeterminate(group.name)"
@change="(v: boolean | string | number) => handleToggleGroup(group.name, v)"
>
全选
</el-checkbox>
<span class="export-columns-group-count">{{ getGroupSelectedCount(group.name) }}/{{ group.fields.length }}</span>
</div>
<div class="export-columns-group-list">
<el-checkbox-group v-model="selected">
<el-checkbox
v-for="col in group.fields"
:key="col"
:label="col"
class="export-column-item"
>
{{ col }}
</el-checkbox>
</el-checkbox-group>
</div>
</div>
<div v-if="visibleGroups.length === 0" class="export-columns-empty">未找到匹配的字段</div>
</div>
</div>
<template #footer>
<el-button @click="emit('update:visible', false)">取消</el-button>
<el-button type="primary" :loading="loading" :disabled="selected.length === 0" @click="handleConfirm">
导出
</el-button>
</template>
</el-dialog>
</template>
<script setup lang="ts">
import { computed, ref, watch } from 'vue'
import { Search } from '@element-plus/icons-vue'
import {
getOrderExportColumnGroupsByMode,
type OrderExportColumnGroup,
type OrderExportColumnMode
} from '../config/order-common-config'
const props = withDefaults(
defineProps<{
visible: boolean
mode?: OrderExportColumnMode
loading?: boolean
/** 持久化 key(按用户/页面/模式独立),为空则不持久化 */
storageKey?: string
}>(),
{
mode: 'waybill',
loading: false,
storageKey: ''
}
)
const emit = defineEmits<{
(e: 'update:visible', visible: boolean): void
(e: 'confirm', columns: string[]): void
}>()
const dialogTitle = computed(() =>
props.mode === 'item' ? '导出选中(含明细)字段设置' : '导出选中(不含明细)字段设置'
)
/** 当前模式可导出的字段(按分组) */
const columnGroups = computed(() => getOrderExportColumnGroupsByMode(props.mode))
/** 全部可选字段数 */
const totalColumnCount = computed(() => columnGroups.value.reduce((sum, g) => sum + g.fields.length, 0))
const keyword = ref('')
const selected = ref<string[]>([])
watch(
() => [props.visible, props.mode, props.storageKey],
() => {
if (props.visible) {
// 打开时优先读取持久化配置,否则默认全选
keyword.value = ''
const saved = loadSavedColumns()
if (saved && saved.length) {
selected.value = saved
} else {
selected.value = columnGroups.value.flatMap((g) => g.fields)
}
} else {
selected.value = []
}
},
{ immediate: true }
)
/** 读取持久化的字段配置(过滤掉当前模式不存在的字段) */
function loadSavedColumns(): string[] {
if (!props.storageKey) return []
try {
const raw = localStorage.getItem(props.storageKey)
if (!raw) return []
const parsed = JSON.parse(raw)
if (!Array.isArray(parsed)) return []
const valid = new Set(columnGroups.value.flatMap((g) => g.fields))
return parsed.filter((f: unknown): f is string => typeof f === 'string' && valid.has(f))
} catch {
return []
}
}
/** 保存字段配置到 localStorage */
function saveColumns(columns: string[]) {
if (!props.storageKey) return
try {
localStorage.setItem(props.storageKey, JSON.stringify(columns))
} catch {
// 忽略存储异常
}
}
/** 勾选/取消勾选等任何选中变化时自动保存(无需再点保存/导出) */
watch(
selected,
() => {
if (props.visible && props.storageKey) {
saveColumns(selected.value)
}
},
{ deep: false }
)
/** 搜索过滤后的分组(隐藏空分组) */
const visibleGroups = computed(() => {
const kw = keyword.value.trim().toLowerCase()
if (!kw) return columnGroups.value
return columnGroups.value
.map((g) => ({ ...g, fields: g.fields.filter((f) => f.toLowerCase().includes(kw)) }))
.filter((g) => g.fields.length > 0)
})
/** 全选状态 */
const isAllSelected = computed(() => totalColumnCount.value > 0 && selected.value.length === totalColumnCount.value)
const isIndeterminate = computed(() => selected.value.length > 0 && !isAllSelected.value)
/** 组内选中状态 */
function getGroupFields(groupName: OrderExportColumnGroup): string[] {
return columnGroups.value.find((g) => g.name === groupName)?.fields ?? []
}
function getGroupSelectedCount(groupName: OrderExportColumnGroup): number {
return selected.value.filter((f) => getGroupFields(groupName).includes(f)).length
}
function isGroupSelected(groupName: OrderExportColumnGroup): boolean {
const fields = getGroupFields(groupName)
return fields.length > 0 && fields.every((f) => selected.value.includes(f))
}
function isGroupIndeterminate(groupName: OrderExportColumnGroup): boolean {
const count = getGroupSelectedCount(groupName)
return count > 0 && !isGroupSelected(groupName)
}
function handleToggleGroup(groupName: OrderExportColumnGroup, value: boolean | string | number) {
const fields = getGroupFields(groupName)
const checked = Boolean(value)
const selectedSet = new Set(selected.value)
fields.forEach((f) => {
if (checked) selectedSet.add(f)
else selectedSet.delete(f)
})
selected.value = Array.from(selectedSet)
}
/** 全部全选/清空 */
function handleToggleAll() {
selected.value = isAllSelected.value ? [] : columnGroups.value.flatMap((g) => g.fields)
}
/** 反选(当前模式下所有字段取反) */
function handleReverse() {
const allFields = columnGroups.value.flatMap((g) => g.fields)
const selectedSet = new Set(selected.value)
selected.value = allFields.filter((f) => !selectedSet.has(f))
}
function handleClear() {
selected.value = []
}
function handleConfirm() {
if (selected.value.length === 0) return
// 选中已通过 watch 自动持久化
emit('confirm', [...selected.value])
}
</script>
<style scoped lang="scss">
.export-columns-dialog {
.export-columns-tip {
margin-bottom: 8px;
font-size: 12px;
color: #909399;
}
.export-columns-toolbar {
display: flex;
align-items: center;
gap: 12px;
padding: 6px 0;
border-bottom: 1px solid #ebeef5;
margin-bottom: 8px;
.export-columns-search {
width: 200px;
}
.export-columns-count {
margin-left: auto;
font-size: 12px;
color: #909399;
white-space: nowrap;
}
}
.export-columns-groups {
max-height: 440px;
overflow-y: auto;
padding: 2px;
.export-columns-group {
margin-bottom: 12px;
border: 1px solid #ebeef5;
border-radius: 6px;
overflow: hidden;
&:last-child {
margin-bottom: 0;
}
}
.export-columns-group-title {
display: flex;
align-items: center;
gap: 12px;
padding: 6px 10px;
background: #f5f7fa;
border-bottom: 1px solid #ebeef5;
.export-columns-group-name {
font-size: 13px;
font-weight: 600;
color: #303133;
}
.export-columns-group-count {
margin-left: auto;
font-size: 12px;
color: #909399;
}
}
.export-columns-group-list {
padding: 8px 10px;
display: grid;
grid-template-columns: repeat(3, 1fr);
gap: 4px 12px;
.export-column-item {
margin-right: 0;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
}
.export-columns-empty {
padding: 24px 0;
text-align: center;
color: #909399;
font-size: 13px;
}
}
}
</style>

View File

@ -320,6 +320,116 @@ export interface PendingBatchAsyncTaskConfig {
failText: string
}
/** order.export 导出模式(waybill=不含明细,item=含明细) */
export type OrderExportColumnMode = 'waybill' | 'item'
/** 导出字段分组 */
export type OrderExportColumnGroup =
| '订单信息'
| '收货信息'
| '商品明细'
| '物流信息'
| '包材信息'
| '流程状态'
| '时间信息'
| '留言备注'
/** order.export 可导出字段(export_columns 中文表头白名单),modes 标注适用导出模式,group 标注展示分组 */
export type OrderExportColumnOption = {
label: string
modes: OrderExportColumnMode[]
group: OrderExportColumnGroup
}
/**
* order.export 全部可导出字段(共 51 个,对齐接口枚举):
* 仅 waybill 模式输出:系统订单号、外部订单号、平台单号、抓取波次号、商品明细;
* 仅 item 模式输出:订单ID、订单号、外部单号、波次号、仓库商品名称、商品条码、商品图片、数量;
* 其余为两种模式通用。
*/
export const ORDER_EXPORT_ALL_COLUMNS: OrderExportColumnOption[] = [
// ===== 订单信息 =====
{ label: '系统订单号', modes: ['waybill'], group: '订单信息' },
{ label: '外部订单号', modes: ['waybill'], group: '订单信息' },
{ label: '平台单号', modes: ['waybill'], group: '订单信息' },
{ label: '订单ID', modes: ['item'], group: '订单信息' },
{ label: '订单号', modes: ['item'], group: '订单信息' },
{ label: '外部单号', modes: ['item'], group: '订单信息' },
{ label: '订单状态', modes: ['waybill', 'item'], group: '订单信息' },
{ label: '抓取波次号', modes: ['waybill'], group: '订单信息' },
{ label: '波次号', modes: ['item'], group: '订单信息' },
{ label: '波次序号', modes: ['waybill', 'item'], group: '订单信息' },
{ label: '货主', modes: ['waybill', 'item'], group: '订单信息' },
{ label: '平台', modes: ['waybill', 'item'], group: '订单信息' },
{ label: '店铺昵称', modes: ['waybill', 'item'], group: '订单信息' },
{ label: '业务类型', modes: ['waybill', 'item'], group: '订单信息' },
{ label: '订单金额', modes: ['waybill', 'item'], group: '订单信息' },
{ label: '实收金额', modes: ['waybill', 'item'], group: '订单信息' },
// ===== 收货信息 =====
{ label: '收件人', modes: ['waybill', 'item'], group: '收货信息' },
{ label: '收件人电话', modes: ['waybill', 'item'], group: '收货信息' },
{ label: '省', modes: ['waybill', 'item'], group: '收货信息' },
{ label: '市', modes: ['waybill', 'item'], group: '收货信息' },
{ label: '区', modes: ['waybill', 'item'], group: '收货信息' },
{ label: '镇', modes: ['waybill', 'item'], group: '收货信息' },
{ label: '详细地址', modes: ['waybill', 'item'], group: '收货信息' },
// ===== 商品明细 =====
{ label: '商品明细', modes: ['waybill'], group: '商品明细' },
{ label: '仓库商品名称', modes: ['item'], group: '商品明细' },
{ label: '商品条码', modes: ['item'], group: '商品明细' },
{ label: '商品图片', modes: ['item'], group: '商品明细' },
{ label: '数量', modes: ['item'], group: '商品明细' },
{ label: '商品种数', modes: ['waybill', 'item'], group: '商品明细' },
{ label: '商品件数', modes: ['waybill', 'item'], group: '商品明细' },
{ label: '商品重量', modes: ['waybill', 'item'], group: '商品明细' },
{ label: '称重重量(g)', modes: ['waybill', 'item'], group: '商品明细' },
// ===== 物流信息 =====
{ label: '物流公司', modes: ['waybill', 'item'], group: '物流信息' },
{ label: '运单号', modes: ['waybill', 'item'], group: '物流信息' },
{ label: '运单接口', modes: ['waybill', 'item'], group: '物流信息' },
{ label: '分配时间', modes: ['waybill', 'item'], group: '物流信息' },
// ===== 包材信息 =====
{ label: '包材ID', modes: ['waybill', 'item'], group: '包材信息' },
{ label: '包材编码', modes: ['waybill', 'item'], group: '包材信息' },
{ label: '包材名称', modes: ['waybill', 'item'], group: '包材信息' },
// ===== 流程状态 =====
{ label: '出库状态', modes: ['waybill', 'item'], group: '流程状态' },
{ label: '复核状态', modes: ['waybill', 'item'], group: '流程状态' },
{ label: '复核完成状态', modes: ['waybill', 'item'], group: '流程状态' },
{ label: '配货状态', modes: ['waybill', 'item'], group: '流程状态' },
{ label: '打包状态', modes: ['waybill', 'item'], group: '流程状态' },
// ===== 时间信息 =====
{ label: '创建时间', modes: ['waybill', 'item'], group: '时间信息' },
{ label: '支付时间', modes: ['waybill', 'item'], group: '时间信息' },
{ label: '发货时间', modes: ['waybill', 'item'], group: '时间信息' },
{ label: '归档时间', modes: ['waybill', 'item'], group: '时间信息' },
// ===== 留言备注 =====
{ label: '备注', modes: ['waybill', 'item'], group: '留言备注' },
{ label: '买家留言', modes: ['waybill', 'item'], group: '留言备注' },
{ label: '卖家留言', modes: ['waybill', 'item'], group: '留言备注' }
]
/** 按导出模式获取可用导出字段(中文表头数组) */
export function getOrderExportColumnsByMode(mode: OrderExportColumnMode): string[] {
return ORDER_EXPORT_ALL_COLUMNS.filter((col) => col.modes.includes(mode)).map((col) => col.label)
}
/** 按导出模式获取分组字段(用于字段选择表单分组展示) */
export function getOrderExportColumnGroupsByMode(
mode: OrderExportColumnMode
): Array<{ name: OrderExportColumnGroup; fields: string[] }> {
const groups: Array<{ name: OrderExportColumnGroup; fields: string[] }> = []
ORDER_EXPORT_ALL_COLUMNS.filter((col) => col.modes.includes(mode)).forEach((col) => {
let group = groups.find((g) => g.name === col.group)
if (!group) {
group = { name: col.group, fields: [] }
groups.push(group)
}
group.fields.push(col.label)
})
return groups
}
export const ORDER_TOOLBAR_BUTTONS: Record<string, ToolbarButtonConfig> = {
refresh: { key: 'refresh', label: '刷新', category: 'refresh', size: 'small', action: 'loadData' },
export: {
@ -332,18 +442,11 @@ export const ORDER_TOOLBAR_BUTTONS: Record<string, ToolbarButtonConfig> = {
buttonType: 'dropdown',
dropdownOptions: [
{ label: '不含明细', action: 'handleExportWaybill' },
{ label: '含明细', action: 'handleExportItem', divided: true }
{ label: '含明细', action: 'handleExportItem', divided: true },
{ label: '导出选中(不含明细)', action: 'handleExportSelectionWaybill', divided: true },
{ label: '导出选中(含明细)', action: 'handleExportSelectionItem' }
]
},
exportSelection: {
key: 'exportSelection',
label: '导出选中',
category: 'setting',
size: 'small',
loadingKey: 'exportSelectionLoading',
disabledKey: 'hasNoSelection',
action: 'handleExportSelection'
},
deliveryExport: {
key: 'deliveryExport',
label: '导出',
@ -809,10 +912,12 @@ export const orderDetailFullSections: OrderDetailSectionConfig[] = [
{ prop: 'warehouse_code', label: '仓库编码' },
{ prop: 'create_channel', label: '来源' },
{ prop: 'order_flag', label: '订单标记', span: 4, multiline: true },
{ prop: 'sys_platform_name', label: '平台编码' },
{ prop: 'sys_platform_name', label: '平台名称' },
{ prop: 'sys_platform_code', label: '平台编码', tag: true },
{ prop: 'source_platform_name', label: '来源平台名' },
{ prop: 'source_platform_code', label: '来源平台编码', tag: true },
{ prop: 'source_order_codes', label: '平台交易单号' },
{ prop: 'oaid_order_source_code', label: 'OAID来源编码' },
{ prop: 'shop_nick', label: '店铺名称' },
{ prop: 'buyer_nick', label: '买家昵称' },
{ prop: 'seller_nick', label: '卖家昵称' },
@ -1027,6 +1132,7 @@ export const orderItemCompactColumns: OrderItemColumnConfig[] = [
export const orderItemFullColumns: OrderItemColumnConfig[] = [
{ prop: 'images', label: '图片', width: 80, align: 'center', image: true },
{ prop: 'id', label: '明细ID', width: 90, align: 'center' },
{ prop: 'order_item_id', label: '订单明细ID', width: 110, align: 'center' },
{ prop: 'order_id', label: '订单ID', width: 90, align: 'center' },
{ prop: 'order_line_no', label: '行号', width: 80, align: 'center' },
{ prop: 'item_code', label: '商品编码', minWidth: 140, showOverflowTooltip: true },
@ -1039,7 +1145,10 @@ export const orderItemFullColumns: OrderItemColumnConfig[] = [
{ prop: 'stock_unit', label: '单位', width: 80, align: 'center' },
{ prop: 'is_batch_mgmt', label: '批次管理', width: 100, align: 'center' },
{ prop: 'is_shelf_life_mgmt', label: '效期管理', width: 100, align: 'center' },
{ prop: 'is_images', label: '有图', width: 80, align: 'center' },
{ prop: 'barcodes', label: '条码', minWidth: 140, showOverflowTooltip: true },
{ prop: 'packing_requirements', label: '包装要求', minWidth: 120, showOverflowTooltip: true },
{ prop: 'picking_locations', label: '拣货位', minWidth: 140, showOverflowTooltip: true },
{ prop: 'store_id', label: '货主ID', width: 100, align: 'center' },
]
@ -1050,7 +1159,6 @@ export const orderItemFullColumns: OrderItemColumnConfig[] = [
export const simpleListToolbarButtonKeys = [
'refresh',
'export',
'exportSelection',
'columnConfig',
'toggleDetail'
]

View File

@ -109,6 +109,14 @@
</div>
</div>
<order-export-columns-dialog
v-model:visible="exportColumnsDialogVisible"
:mode="exportColumnsMode"
:loading="exportColumnsLoading"
:storage-key="exportColumnsStorageKey"
@confirm="confirmExportColumns"
/>
<order-export-progress-dialog
v-model:visible="exportDialogVisible"
:loading="exportLoading"
@ -145,6 +153,7 @@ import PendingOrderDetailPanel from './component/PendingOrderDetailPanel.vue'
import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue'
import log from './component/log.vue'
import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue'
import OrderExportColumnsDialog from './component/OrderExportColumnsDialog.vue'
import { createOrderPageExport } from './utils/order-page-export'
import { buildOrderWhereConditions, parseOrderListResponse } from './utils/order-index-helpers'
import { useOrderListPageCleanup } from './utils/use-order-list-page-cleanup'
@ -291,7 +300,14 @@ const {
handleExport,
handleExportWaybill,
handleExportItem,
handleExportSelection
handleExportSelection,
handleExportSelectionWaybill,
handleExportSelectionItem,
exportColumnsDialogVisible,
exportColumnsMode,
exportColumnsLoading,
exportColumnsStorageKey,
confirmExportColumns
} = pageExport
async function loadFilterData() {
@ -377,6 +393,8 @@ const { actionMap: toolbarActionMap } = createSimpleListToolbarController({
handleExportWaybill,
handleExportItem,
handleExportSelection,
handleExportSelectionWaybill,
handleExportSelectionItem,
openColumnConfigPanel,
toggleDetailVisible
})

View File

@ -214,6 +214,14 @@
@submit="submitAllocateSubOrderNumber"
/>
<order-export-columns-dialog
v-model:visible="exportColumnsDialogVisible"
:mode="exportColumnsMode"
:loading="exportColumnsLoading"
:storage-key="exportColumnsStorageKey"
@confirm="confirmExportColumns"
/>
<order-export-progress-dialog
v-model:visible="exportDialogVisible"
:loading="exportLoading"
@ -254,6 +262,7 @@ import OrderDetailDisplayToggle, { type OrderDetailDisplayMode } from './compone
import ExpressWaybillPanel from './component/ExpressWaybillPanel.vue'
import log from './component/log.vue'
import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue'
import OrderExportColumnsDialog from './component/OrderExportColumnsDialog.vue'
import WavePlatformPrintPreviewDialog from '@/views/order/waveOrder/component/WavePlatformPrintPreviewDialog.vue'
import { createOrderPageExport } from './utils/order-page-export'
import { buildOrderWhereConditions, parseOrderListResponse, resolveOrderRecheckStatus } from './utils/order-index-helpers'
@ -453,7 +462,14 @@ const {
handleExport,
handleExportWaybill,
handleExportItem,
handleExportSelection
handleExportSelection,
handleExportSelectionWaybill,
handleExportSelectionItem,
exportColumnsDialogVisible,
exportColumnsMode,
exportColumnsLoading,
exportColumnsStorageKey,
confirmExportColumns
} = pageExport
function handleConditionChange() {
@ -525,6 +541,8 @@ const { actionMap: toolbarActionMap } = createSimpleListToolbarController({
handleExportWaybill,
handleExportItem,
handleExportSelection,
handleExportSelectionWaybill,
handleExportSelectionItem,
openColumnConfigPanel,
toggleDetailVisible
})

View File

@ -109,6 +109,14 @@
</div>
</div>
<order-export-columns-dialog
v-model:visible="exportColumnsDialogVisible"
:mode="exportColumnsMode"
:loading="exportColumnsLoading"
:storage-key="exportColumnsStorageKey"
@confirm="confirmExportColumns"
/>
<order-export-progress-dialog
v-model:visible="exportDialogVisible"
:loading="exportLoading"
@ -145,6 +153,7 @@ import PendingOrderDetailPanel from './component/PendingOrderDetailPanel.vue'
import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue'
import log from './component/log.vue'
import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue'
import OrderExportColumnsDialog from './component/OrderExportColumnsDialog.vue'
import { createOrderPageExport } from './utils/order-page-export'
import { buildOrderWhereConditions, parseOrderListResponse } from './utils/order-index-helpers'
import { useOrderListPageCleanup } from './utils/use-order-list-page-cleanup'
@ -291,7 +300,14 @@ const {
handleExport,
handleExportWaybill,
handleExportItem,
handleExportSelection
handleExportSelection,
handleExportSelectionWaybill,
handleExportSelectionItem,
exportColumnsDialogVisible,
exportColumnsMode,
exportColumnsLoading,
exportColumnsStorageKey,
confirmExportColumns
} = pageExport
async function loadFilterData() {
@ -377,6 +393,8 @@ const { actionMap: toolbarActionMap } = createSimpleListToolbarController({
handleExportWaybill,
handleExportItem,
handleExportSelection,
handleExportSelectionWaybill,
handleExportSelectionItem,
openColumnConfigPanel,
toggleDetailVisible
})

View File

@ -352,6 +352,14 @@
/>
</div>
<order-export-columns-dialog
v-model:visible="exportColumnsDialogVisible"
:mode="exportColumnsMode"
:loading="exportColumnsLoading"
:storage-key="exportColumnsStorageKey"
@confirm="confirmExportColumns"
/>
<order-export-progress-dialog
v-model:visible="exportDialogVisible"
:loading="exportLoading"
@ -406,6 +414,7 @@ import UpdateRemarkForm from './form/UpdateRemarkForm.vue'
import BatchAsyncTaskForm from './form/BatchAsyncTaskForm.vue'
import AllocateSubOrderNumberForm from './form/AllocateSubOrderNumberForm.vue'
import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue'
import OrderExportColumnsDialog from './component/OrderExportColumnsDialog.vue'
import { createOrderPageExport } from './utils/order-page-export'
import { buildOrderWhereConditions, parseOrderListResponse, resolveOrderRecheckStatus } from './utils/order-index-helpers'
import { useOrderListPageCleanup } from './utils/use-order-list-page-cleanup'
@ -668,7 +677,14 @@ const {
handleExport,
handleExportWaybill,
handleExportItem,
handleExportSelection
handleExportSelection,
handleExportSelectionWaybill,
handleExportSelectionItem,
exportColumnsDialogVisible,
exportColumnsMode,
exportColumnsLoading,
exportColumnsStorageKey,
confirmExportColumns
} = pageExport
async function loadFilterData() {
@ -936,6 +952,8 @@ const {
handleExportWaybill,
handleExportItem,
handleExportSelection,
handleExportSelectionWaybill,
handleExportSelectionItem,
openColumnConfigPanel,
toggleDetailVisible,
openCreateOrderDialog,

View File

@ -164,6 +164,14 @@
</div>
</div>
<order-export-columns-dialog
v-model:visible="exportColumnsDialogVisible"
:mode="exportColumnsMode"
:loading="exportColumnsLoading"
:storage-key="exportColumnsStorageKey"
@confirm="confirmExportColumns"
/>
<order-export-progress-dialog
v-model:visible="exportDialogVisible"
:loading="exportLoading"
@ -202,6 +210,7 @@ import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue'
import OutboundManualOutboundForm from './component/OutboundManualOutboundForm.vue'
import ExpressWaybillPanel from './component/ExpressWaybillPanel.vue'
import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue'
import OrderExportColumnsDialog from './component/OrderExportColumnsDialog.vue'
import { createOrderPageExport } from './utils/order-page-export'
import { buildOrderWhereConditions, parseOrderListResponse } from './utils/order-index-helpers'
import { useOrderListPageCleanup } from './utils/use-order-list-page-cleanup'
@ -294,7 +303,14 @@ const {
handleExport,
handleExportWaybill,
handleExportItem,
handleExportSelection
handleExportSelection,
handleExportSelectionWaybill,
handleExportSelectionItem,
exportColumnsDialogVisible,
exportColumnsMode,
exportColumnsLoading,
exportColumnsStorageKey,
confirmExportColumns
} = pageExport
async function loadData() {
@ -478,6 +494,8 @@ const { actionMap: baseToolbarActionMap } = createSimpleListToolbarController({
handleExportWaybill,
handleExportItem,
handleExportSelection,
handleExportSelectionWaybill,
handleExportSelectionItem,
openColumnConfigPanel,
toggleDetailVisible
})

View File

@ -359,6 +359,14 @@
/>
</div>
<order-export-columns-dialog
v-model:visible="exportColumnsDialogVisible"
:mode="exportColumnsMode"
:loading="exportColumnsLoading"
:storage-key="exportColumnsStorageKey"
@confirm="confirmExportColumns"
/>
<order-export-progress-dialog
v-model:visible="exportDialogVisible"
:loading="exportLoading"
@ -416,6 +424,7 @@ import BatchAsyncTaskForm from './form/BatchAsyncTaskForm.vue'
import AllocateSubOrderNumberForm from './form/AllocateSubOrderNumberForm.vue'
import ExpressWaybillPanel from './component/ExpressWaybillPanel.vue'
import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue'
import OrderExportColumnsDialog from './component/OrderExportColumnsDialog.vue'
import { createOrderPageExport } from './utils/order-page-export'
import { buildOrderWhereConditions, parseOrderListResponse, resolveOrderInterceptStatus, resolveOrderRecheckStatus, isActiveInterceptStatus } from './utils/order-index-helpers'
import { useOrderListPageCleanup } from './utils/use-order-list-page-cleanup'
@ -635,7 +644,14 @@ const {
handleExport,
handleExportWaybill,
handleExportItem,
handleExportSelection
handleExportSelection,
handleExportSelectionWaybill,
handleExportSelectionItem,
exportColumnsDialogVisible,
exportColumnsMode,
exportColumnsLoading,
exportColumnsStorageKey,
confirmExportColumns
} = pageExport
function handleConditionChange() {
@ -866,6 +882,8 @@ const {
handleExportWaybill,
handleExportItem,
handleExportSelection,
handleExportSelectionWaybill,
handleExportSelectionItem,
openColumnConfigPanel,
toggleDetailVisible,
openCreateOrderDialog,

View File

@ -157,6 +157,14 @@
</div>
<order-export-columns-dialog
v-model:visible="exportColumnsDialogVisible"
:mode="exportColumnsMode"
:loading="exportColumnsLoading"
:storage-key="exportColumnsStorageKey"
@confirm="confirmExportColumns"
/>
<order-export-progress-dialog
v-model:visible="exportDialogVisible"
:loading="exportLoading"
@ -196,6 +204,7 @@ import OrderDetailDisplayToggle, { type OrderDetailDisplayMode } from './compone
import { useCreateOrderSession } from './composables/useCreateOrderSession'
import log from './component/log.vue'
import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue'
import OrderExportColumnsDialog from './component/OrderExportColumnsDialog.vue'
import UpdateRemarkForm from './form/UpdateRemarkForm.vue'
import { createOrderPageExport } from './utils/order-page-export'
import { buildOrderWhereConditions, parseOrderListResponse, resolveOrderRecheckStatus } from './utils/order-index-helpers'
@ -379,10 +388,17 @@ const {
exportProgressPercent,
exportProgressStatus,
exportStatusLabel,
exportColumnsDialogVisible,
exportColumnsMode,
exportColumnsLoading,
exportColumnsStorageKey,
handleExport,
handleExportWaybill,
handleExportItem,
handleExportSelection
handleExportSelection,
handleExportSelectionWaybill,
handleExportSelectionItem,
confirmExportColumns
} = pageExport
function handleConditionChange() {
@ -446,6 +462,8 @@ const {
handleExportWaybill,
handleExportItem,
handleExportSelection,
handleExportSelectionWaybill,
handleExportSelectionItem,
openColumnConfigPanel,
toggleDetailVisible,
openCreateOrderDialog,

View File

@ -113,17 +113,31 @@ export function parseOrderDetailPayload(res: any): Record<string, any> {
return nested && typeof nested === 'object' ? nested : res
}
/** 商品明细行规范化:兼容图片字段(接口返回 image_url,面板按 images 渲染) */
function normalizeOrderItemRow(row: any): any {
if (!row || typeof row !== 'object') return row
if (Array.isArray(row.images)) return row
const urls = Array.isArray(row.image_url)
? row.image_url
: typeof row.image_url === 'string' && row.image_url
? [row.image_url]
: []
return urls.length ? { ...row, images: urls } : row
}
/** order.detail 商品明细:优先 orderItems,兼容 items 及嵌套字段 */
export function normalizeOrderDetailItems(data: Record<string, any>): any[] {
if (Array.isArray(data.orderItems)) return data.orderItems
if (Array.isArray(data.items)) return data.items
const normalize = (rows: any[]) => (Array.isArray(rows) ? rows.map(normalizeOrderItemRow) : [])
if (Array.isArray(data.orderItems)) return normalize(data.orderItems)
if (Array.isArray(data.items)) return normalize(data.items)
const rawItems = data.order?.items || data.detail?.items
if (Array.isArray(rawItems)) return rawItems
if (Array.isArray(rawItems)) return normalize(rawItems)
if (typeof rawItems === 'string') {
try {
const parsed = JSON.parse(rawItems)
return Array.isArray(parsed) ? parsed : []
return Array.isArray(parsed) ? normalize(parsed) : []
} catch {
return []
}

View File

@ -2,10 +2,18 @@ import { ref, type Ref } from 'vue'
import { ElMessage } from 'element-plus'
import type { OrderExportMode } from '@/api/order.index/orderindex'
import { useOrderAsyncExport } from '@/composables/useOrderAsyncExport'
import { useUserStore } from '@/stores/modules/user'
import { ORDER_INDEX_EXPORT_SCOPES, sanitizeOrderListWhere } from './order-index-helpers'
import { exportUpperTableRows } from './export'
import { translateOrderField } from '../config/order-common-config'
/** 提取选中行的订单 id(过滤空值) */
function extractSelectionIds(rows: any[]): Array<number | string> {
return rows
.map((row: any) => row?.id)
.filter((id: any) => id !== undefined && id !== null && id !== '')
}
export function createOrderPageExport(options: {
scopeKey: keyof typeof ORDER_INDEX_EXPORT_SCOPES
buildWhere: () => Record<string, unknown>
@ -18,6 +26,20 @@ export function createOrderPageExport(options: {
const asyncExport = useOrderAsyncExport(options.storageKey)
const exportSelectionLoading = ref(false)
/** 导出选中(含明细/不含明细)字段选择对话框状态 */
const exportColumnsDialogVisible = ref(false)
const exportColumnsMode = ref<OrderExportMode>('waybill')
const exportColumnsLoading = ref(false)
/** 导出选中字段配置持久化 key(按 用户/角色/页面/模式 独立保存;前缀区别于字段设置,避免被“故障修复”清除) */
const exportColumnsStorageKey = ref('')
function getExportColumnsStorageKey(mode: OrderExportMode): string {
const userStore = useUserStore()
const userId = userStore.user?.username || userStore.user?.id || 'unknown'
const roleId = userStore.roleId || 'default'
return `order_export_columns_${userId}_${roleId}_${options.scopeKey}_${mode}`
}
async function handleExport(exportMode: OrderExportMode = 'waybill') {
const scope = ORDER_INDEX_EXPORT_SCOPES[options.scopeKey]
if (!scope) {
@ -61,12 +83,71 @@ export function createOrderPageExport(options: {
}
}
/** 打开导出选中字段选择对话框(含明细/不含明细) */
function openExportColumnsDialog(mode: OrderExportMode) {
if (!options.selectionRows.value.length) {
ElMessage.warning('请先勾选要导出的订单')
return
}
exportColumnsMode.value = mode
exportColumnsStorageKey.value = getExportColumnsStorageKey(mode)
exportColumnsDialogVisible.value = true
}
async function handleExportSelectionWaybill() {
openExportColumnsDialog('waybill')
}
async function handleExportSelectionItem() {
openExportColumnsDialog('item')
}
/** 字段选择确认后,提交 order.export 异步导出选中订单 */
async function confirmExportColumns(columns: string[]) {
const scope = ORDER_INDEX_EXPORT_SCOPES[options.scopeKey]
if (!scope) {
ElMessage.error('未配置导出范围')
return
}
const ids = extractSelectionIds(options.selectionRows.value)
if (!ids.length) {
ElMessage.warning('请先勾选要导出的订单')
return
}
if (exportColumnsLoading.value) return
exportColumnsLoading.value = true
try {
await asyncExport.submitExportTask({
...scope,
where: sanitizeOrderListWhere({
...options.buildWhere(),
id: { operator: 'in', value: ids }
}),
sort: options.buildSort?.(),
export_mode: exportColumnsMode.value,
export_columns: columns
})
exportColumnsDialogVisible.value = false
} catch (error: any) {
ElMessage.error(error?.message || '导出任务提交失败')
} finally {
exportColumnsLoading.value = false
}
}
return {
...asyncExport,
exportSelectionLoading,
exportColumnsDialogVisible,
exportColumnsMode,
exportColumnsLoading,
exportColumnsStorageKey,
handleExport: handleExportWaybill,
handleExportWaybill,
handleExportItem,
handleExportSelection
handleExportSelection,
handleExportSelectionWaybill,
handleExportSelectionItem,
confirmExportColumns
}
}

View File

@ -22,12 +22,18 @@ function bindExportToolbarActions(params: {
handleExportWaybill?: () => Promise<void>
handleExportItem?: () => Promise<void>
handleExportSelection?: () => Promise<void>
handleExportSelectionWaybill?: () => Promise<void>
handleExportSelectionItem?: () => Promise<void>
}) {
return {
handleExport: params.handleExport,
handleExportWaybill: params.handleExportWaybill || params.handleExport,
handleExportItem: params.handleExportItem || params.handleExport,
...(params.handleExportSelection ? { handleExportSelection: params.handleExportSelection } : {})
...(params.handleExportSelection ? { handleExportSelection: params.handleExportSelection } : {}),
...(params.handleExportSelectionWaybill
? { handleExportSelectionWaybill: params.handleExportSelectionWaybill }
: {}),
...(params.handleExportSelectionItem ? { handleExportSelectionItem: params.handleExportSelectionItem } : {})
}
}
@ -326,6 +332,8 @@ export function createReviewToolbarController(params: {
handleExportWaybill?: () => Promise<void>
handleExportItem?: () => Promise<void>
handleExportSelection?: () => Promise<void>
handleExportSelectionWaybill?: () => Promise<void>
handleExportSelectionItem?: () => Promise<void>
openColumnConfigPanel: () => void
toggleDetailVisible: () => void
openCreateOrderDialog: () => void
@ -457,6 +465,8 @@ export function createPendingToolbarController(params: {
handleExportWaybill?: () => Promise<void>
handleExportItem?: () => Promise<void>
handleExportSelection?: () => Promise<void>
handleExportSelectionWaybill?: () => Promise<void>
handleExportSelectionItem?: () => Promise<void>
openColumnConfigPanel: () => void
toggleDetailVisible: () => void
openCreateOrderDialog: () => void
@ -1535,6 +1545,8 @@ export function createSimpleListToolbarController(params: {
handleExportWaybill?: () => Promise<void>
handleExportItem?: () => Promise<void>
handleExportSelection?: () => Promise<void>
handleExportSelectionWaybill?: () => Promise<void>
handleExportSelectionItem?: () => Promise<void>
openColumnConfigPanel: () => void
toggleDetailVisible: () => void
}) {

View File

@ -137,8 +137,8 @@ export const waveAvailableFields = [
type: 'select',
options: [
{ label: '未分配', value: '未分配' },
{ label: '部分分配', value: '部分分配' },
{ label: '已分配', value: '已分配' },
{ label: '部分分配', value: 'partial' },
]
}), group: WAVE_SCAN_PROCESS_STATUS_GROUP },
{ ...scanWorkflowField({
@ -147,6 +147,7 @@ export const waveAvailableFields = [
type: 'select',
options: [
{ label: '未分配', value: 'unassigned' },
{ label: '部分分配', value: 'partially_assigned' },
{ label: '已分配', value: 'assigned' },
]
}), group: WAVE_SCAN_PROCESS_STATUS_GROUP },
@ -156,25 +157,17 @@ export const waveAvailableFields = [
type: 'select',
options: [
{ label: '未打印', value: 'unprinted' },
{ label: '部分打印', value: 'partially_printed' },
{ label: '已打印', value: 'printed' },
]
}), group: WAVE_SCAN_PROCESS_STATUS_GROUP },
{ ...scanWorkflowField({
label: '拣货状态',
value: 'pick_assignment_status',
type: 'select',
options: [
{ label: '未拣货', value: '未拣货' },
{ label: '部分拣货', value: '部分拣货' },
{ label: '已拣货', value: '已拣货' },
]
}), group: WAVE_SCAN_PROCESS_STATUS_GROUP },
{ ...scanWorkflowField({
label: '复核状态',
value: 'review_assignment_status',
type: 'select',
options: [
{ label: '未复核', value: 'unreviewed' },
{ label: '部分复核', value: 'partially_reviewed' },
{ label: '已复核', value: 'reviewed' },
]
}), group: WAVE_SCAN_PROCESS_STATUS_GROUP },
@ -404,7 +397,6 @@ export const waveWhereAllowedFieldList = [
'storage_assignment_status',
'express_assignment_status',
'print_assignment_status',
'pick_assignment_status',
'review_assignment_status',
'total_orders_min',
'total_orders_max',

View File

@ -23,6 +23,14 @@
<span class="summary-label">订单状态</span>
<el-tag size="small" :type="entryOrderStatusTag">{{ entryOrderStatusLabel }}</el-tag>
</span>
<span v-if="entryTotalOrderLines" class="summary-inline">
<span class="summary-label">商品类型数</span>
<span class="summary-value">{{ entryTotalOrderLines }}</span>
</span>
<span v-if="entryTotalQuantity" class="summary-inline">
<span class="summary-label">商品总数</span>
<span class="summary-value">{{ entryTotalQuantity }}</span>
</span>
<span v-if="entryExpressCode" class="summary-inline">
<span class="summary-label">运单号</span>
<span class="summary-value">{{ entryExpressCode }}</span>
@ -194,6 +202,7 @@ import {
receivingCompare,
type BindReceivingResponse,
type EntryDetailItem,
type EntryOrderDetail,
type ReceivingCompareResponse,
type ReceivingCompareItem,
type ReceivingCompareRow,
@ -260,6 +269,8 @@ const receivingList = ref<ReceivingListItem[]>([])
const receivingListLoading = ref(false)
const compareLoading = ref(false)
const entryItems = ref<EntryDetailItem[]>([])
const entryOrderInfo = ref<EntryOrderDetail | null>(null)
const entryTotalQuantityRaw = ref<number | null>(null)
const selectedReceivingRows = ref<ReceivingListItem[]>([])
const compareRows = ref<CompareDisplayRow[]>([])
const bindSubmitting = ref(false)
@ -325,6 +336,31 @@ const entryPurchaseOrderCode = computed(() => {
return code !== null && code !== undefined && String(code).trim() ? String(code).trim() : ''
})
const entryTotalQuantity = computed(() => {
// 1) 优先:接口在 entryOrder 外层返回的 total_quantity
if (entryTotalQuantityRaw.value !== null && entryTotalQuantityRaw.value !== undefined) {
return String(entryTotalQuantityRaw.value)
}
// 2) entryOrder 内返回的 total_quantity
const v = entryOrderInfo.value?.total_quantity
if (v !== null && v !== undefined) return String(v)
// 3) 回退:按明细数量求和(兼容 planned / count / total_planned)
const sum = entryItems.value.reduce((acc, item) => {
const raw = item as Record<string, unknown>
const qty = raw.planned ?? raw.count ?? raw.total_planned
return acc + (Number(qty) || 0)
}, 0)
return sum > 0 ? String(sum) : ''
})
const entryTotalOrderLines = computed(() => {
const v = entryOrderInfo.value?.total_order_lines
if (v !== null && v !== undefined) return String(v)
// 接口未返回时按明细条数统计
const n = entryItems.value.length
return n > 0 ? String(n) : ''
})
const isEntryFullyCovered = ref(false)
const canSubmitBind = computed(
@ -446,6 +482,81 @@ function buildEntryOnlyCompareRows(): CompareDisplayRow[] {
})
}
/**
* 收集对照记录(兼容两种返回结构):
* 1) 新结构:顶层合并后的 comparison + receiving_only
* 2) 旧结构:遍历各收货单 comparisons 下的 comparison + receiving_only
* 同时跟踪每个商品的最佳匹配状态(matched > entry_only)。
*/
function collectCompareRecords(payload: ReceivingCompareResponse): {
records: ReceivingCompareRow[]
hasUnmatchedEntry: boolean
} {
const records: ReceivingCompareRow[] = []
const seenKeys = new Set<string>()
// 按 warehouse_item_code 跟踪最佳匹配状态:matched > entry_only
const itemMatchStatus = new Map<string, string>()
const pushRecords = (items: ReceivingCompareRow[]) => {
for (const record of items) {
const raw = record as Record<string, unknown>
const ms = String(raw.match_status ?? '').toLowerCase()
// 收货侧可用量为 0 则不展示(无实际可绑定量)
if (!raw.warehouse_item_code && Number(raw.receiving_available) === 0) continue
const key = String(raw.warehouse_item_code ?? Math.random())
// 更新该商品的最佳匹配状态
const prev = itemMatchStatus.get(key)
if (!prev || (prev === 'entry_only' && ms === 'matched')) {
itemMatchStatus.set(key, ms)
}
if (!seenKeys.has(key)) {
seenKeys.add(key)
records.push(record)
} else if (ms === 'matched') {
// 已存在 entry_only 记录,现在遇到 matched,覆盖更新
const idx = records.findIndex((r) => {
const rRaw = r as Record<string, unknown>
return String(rRaw.warehouse_item_code ?? '') === key
})
if (idx >= 0) {
records[idx] = record
}
}
}
}
// 1) 新结构:顶层合并后的 comparison / receiving_only
if (Array.isArray(payload.comparison) || Array.isArray(payload.receiving_only)) {
pushRecords([
...(Array.isArray(payload.comparison) ? payload.comparison : []),
...(Array.isArray(payload.receiving_only) ? payload.receiving_only : []),
])
}
// 2) 旧结构回退:遍历各收货单 comparisons
if (!records.length && Array.isArray(payload.comparisons)) {
for (const item of payload.comparisons) {
pushRecords([
...(Array.isArray(item.comparison) ? item.comparison : []),
...(Array.isArray(item.receiving_only) ? item.receiving_only : []),
])
}
}
// 只要有一个 entry_only 的商品从未被任何收货单 matched,则不算完全覆盖
let hasUnmatchedEntry = false
for (const [, status] of itemMatchStatus) {
if (status === 'entry_only') {
hasUnmatchedEntry = true
break
}
}
return { records, hasUnmatchedEntry }
}
function syncTableHeight() {
const el = tableHostRef.value
if (!el) return
@ -471,6 +582,8 @@ function resetReceivingState() {
selectedReceivingRows.value = []
compareRows.value = []
entryItems.value = []
entryOrderInfo.value = null
entryTotalQuantityRaw.value = null
isEntryFullyCovered.value = false
pagination.currentPage = 1
pagination.pageSize = 10
@ -498,6 +611,11 @@ async function loadEntryItems() {
try {
const res = await getEntryDetail({ id: entryOrderId.value })
const order = res.entryOrder ?? res.data?.entryOrder
entryOrderInfo.value = order ?? null
// total_quantity 可能在 entryOrder 外层返回(storage.entry.get 实际结构)
const payloadTotal = res.data && typeof res.data === 'object' ? res.data.total_quantity : undefined
entryTotalQuantityRaw.value =
payloadTotal !== undefined && payloadTotal !== null ? payloadTotal : (order?.total_quantity ?? null)
entryItems.value = Array.isArray(order?.items) ? order.items : []
if (!selectedReceivingRows.value.length) {
compareRows.value = buildEntryOnlyCompareRows()
@ -505,6 +623,8 @@ async function loadEntryItems() {
} catch (error) {
console.error('加载入库单明细失败:', error)
entryItems.value = []
entryOrderInfo.value = null
entryTotalQuantityRaw.value = null
compareRows.value = []
ElMessage.error('加载入库单明细失败')
}
@ -552,53 +672,7 @@ async function refreshCompareRows() {
res.data && typeof res.data === 'object' ? { ...res, ...res.data } : res
) as ReceivingCompareResponse
const allRecords: ReceivingCompareRow[] = []
const seenKeys = new Set<string>()
// 按 warehouse_item_code 跟踪最佳匹配状态:matched > entry_only
const itemMatchStatus = new Map<string, string>()
for (const item of (payload.comparisons ?? [])) {
const records = [
...(Array.isArray(item.comparison) ? item.comparison : []),
...(Array.isArray(item.receiving_only) ? item.receiving_only : []),
]
for (const record of records) {
const raw = record as Record<string, unknown>
const ms = String(raw.match_status ?? '').toLowerCase()
// 收货侧可用量为 0 则不展示(无实际可绑定量)
if (!raw.warehouse_item_code && Number(raw.receiving_available) === 0) continue
const key = String(raw.warehouse_item_code ?? Math.random())
// 更新该商品的最佳匹配状态
const prev = itemMatchStatus.get(key)
if (!prev || (prev === 'entry_only' && ms === 'matched')) {
itemMatchStatus.set(key, ms)
}
if (!seenKeys.has(key)) {
seenKeys.add(key)
allRecords.push(record)
} else if (ms === 'matched') {
// 已存在 entry_only 记录,现在遇到 matched,覆盖更新
const idx = allRecords.findIndex((r) => {
const rRaw = r as Record<string, unknown>
return String(rRaw.warehouse_item_code ?? '') === key
})
if (idx >= 0) {
allRecords[idx] = record
}
}
}
}
// 只要有一个 entry_only 的商品从未被任何收货单 matched,则不算完全覆盖
let hasUnmatchedEntry = false
for (const [, status] of itemMatchStatus) {
if (status === 'entry_only') {
hasUnmatchedEntry = true
break
}
}
const { records: allRecords, hasUnmatchedEntry } = collectCompareRecords(payload)
isEntryFullyCovered.value = !hasUnmatchedEntry
if (allRecords.length) {

View File

@ -302,15 +302,12 @@ export function isPendingEntryOrderStatus(status: unknown): boolean {
return upper === 'PENDING' || upper === 'CREATED' || normalized === '待入库' || normalized === '已创建'
}
/** 是否允许快捷直入(storage.entry.quickInbound,仅 CREATED 且未绑定收货单) */
/** 是否允许快捷直入(storage.entry.quickInbound,仅 CREATED 状态;已绑定收货单的同样允许) */
export function canQuickInbound(status: unknown, hasReceiving?: unknown, receivingBindings?: unknown): boolean {
if (status === null || status === undefined || status === '') return false
const normalized = String(status).trim()
const upper = normalized.toUpperCase()
if (upper !== 'CREATED' && normalized !== '已创建') return false
// 已绑定收货单的排除虚拟直入
if (hasReceiving === true) return false
if (Array.isArray(receivingBindings) && receivingBindings.length > 0) return false
return true
}

View File

@ -26,6 +26,31 @@
</div>
</div>
<div class="query-bar">
<div class="query-item">
<span class="query-label">货主</span>
<el-select
v-model="queryForm.store_id"
placeholder="全部货主"
clearable
filterable
multiple
collapse-tags
size="small"
style="width: 240px"
:loading="storeLoading"
@change="handleStoreFilterChange"
>
<el-option
v-for="opt in storeOptions"
:key="String(opt.value)"
:label="opt.label"
:value="opt.value"
/>
</el-select>
</div>
</div>
<div class="toolbar">
<div class="toolbar-left">
<el-button type="primary" size="small" :loading="loading" @click="handleQuery">刷新</el-button>
@ -70,8 +95,28 @@
<div v-else class="expand-empty">无可用补货库位(存货区与分拣区均无库存)</div>
</template>
</el-table-column>
<el-table-column prop="stock_id" label="SKU ID" min-width="100" align="right" sortable="custom" />
<el-table-column prop="stock_code" label="SKU编码" min-width="140" show-overflow-tooltip />
<el-table-column prop="stock_name" label="商品名称" min-width="160" show-overflow-tooltip />
<el-table-column prop="store_name" label="货主名称" min-width="140" show-overflow-tooltip />
<el-table-column label="条码" min-width="180">
<template #default="{ row }">
<template v-if="row.barcodes?.length">
<div class="barcode-list">
<el-tag
v-for="bc in row.barcodes"
:key="bc.id ?? bc.barcode"
size="small"
type="info"
class="barcode-tag"
>
{{ bc.barcode }}
</el-tag>
</div>
</template>
<span v-else class="no-location-text">-</span>
</template>
</el-table-column>
<el-table-column
prop="pick_zone_quantity"
label="分拣区库存"
@ -148,6 +193,11 @@
import { computed, onMounted, reactive, ref } from 'vue'
import { ElMessage, type FormInstance } from 'element-plus'
import { getReplenishmentDemand } from '@/api/storage.management/management'
import { loadStores } from '@/api/index/index'
import {
extractStoreListFromResponse,
mapStoreListToSelectOptions,
} from '@/views/order/orderManagement/config/order-common-config'
import {
defaultQueryForm,
exportReplenishmentDemandCsv,
@ -170,6 +220,8 @@ const queryTime = ref(0)
const tableData = ref<ReplenishmentDemandListItem[]>([])
const selectedRows = ref<ReplenishmentDemandListItem[]>([])
const summary = ref<ReplenishmentDemandSummary>({})
const storeOptions = ref<Array<{ label: string; value: number | string }>>([])
const storeLoading = ref(false)
const queryForm = reactive<ReplenishmentDemandQueryForm>(defaultQueryForm())
const pagination = reactive({
@ -183,7 +235,7 @@ const defaultTableSort = computed(() => ({
}))
function buildRequestBody() {
return {
const body: Record<string, unknown> = {
pagination: {
page: pagination.page,
pageSize: queryForm.pageSize,
@ -193,6 +245,16 @@ function buildRequestBody() {
sortOrder: queryForm.sortOrder,
},
}
const storeId = queryForm.store_id
const hasStoreFilter =
storeId !== undefined &&
storeId !== null &&
storeId !== '' &&
!(Array.isArray(storeId) && storeId.length === 0)
if (hasStoreFilter) {
body.store_id = storeId
}
return body
}
async function fetchData() {
@ -230,6 +292,24 @@ function handleQuery() {
void fetchData()
}
async function loadStoreOptions() {
storeLoading.value = true
try {
const res: any = await loadStores()
const rawStores = extractStoreListFromResponse(res)
storeOptions.value = mapStoreListToSelectOptions(rawStores)
} catch {
storeOptions.value = []
} finally {
storeLoading.value = false
}
}
function handleStoreFilterChange() {
pagination.page = 1
void fetchData()
}
function handleReset() {
Object.assign(queryForm, defaultQueryForm())
pagination.page = 1
@ -281,6 +361,7 @@ function statusTagType(status?: string) {
}
onMounted(() => {
void loadStoreOptions()
void fetchData()
})
</script>
@ -369,6 +450,38 @@ onMounted(() => {
}
}
.query-bar {
display: flex;
align-items: center;
gap: 16px;
padding: 10px 16px;
background: #fff;
border-radius: 6px;
flex-shrink: 0;
.query-item {
display: flex;
align-items: center;
gap: 8px;
.query-label {
font-size: 13px;
color: #606266;
white-space: nowrap;
}
}
}
.barcode-list {
display: flex;
flex-wrap: wrap;
gap: 4px;
.barcode-tag {
max-width: 100%;
}
}
.toolbar {
display: flex;
justify-content: space-between;

View File

@ -1,6 +1,8 @@
import type { ReplenishmentDemandSortField } from '@/api/storage.management/management'
export interface ReplenishmentDemandQueryForm {
/** 货主筛选:支持单值或数组 */
store_id?: number | string | Array<number | string>
pageSize: number
sortField: ReplenishmentDemandSortField
sortOrder: 'ASC' | 'DESC'
@ -10,6 +12,15 @@ export interface ReplenishmentDemandListItem {
stock_id: number
stock_code?: string
stock_name?: string
/** 货主ID */
store_id?: number
/** 货主名称 */
store_name?: string
/** 条码列表 */
barcodes?: Array<{
id?: number
barcode?: string
}>
pick_zone_quantity?: number
storage_zone_quantity?: number
total_demand?: number
@ -33,6 +44,7 @@ export interface ReplenishmentDemandSummary {
}
export const defaultQueryForm = (): ReplenishmentDemandQueryForm => ({
store_id: undefined,
pageSize: 20,
sortField: 'shortage',
sortOrder: 'DESC',
@ -96,6 +108,8 @@ export function exportReplenishmentDemandCsv(rows: ReplenishmentDemandListItem[]
const headers = [
'SKU编码',
'商品名称',
'货主名称',
'条码',
'分拣区库存',
'存货区库存',
'总需求量',
@ -107,6 +121,8 @@ export function exportReplenishmentDemandCsv(rows: ReplenishmentDemandListItem[]
const lines = rows.map((row) => [
row.stock_code ?? '',
row.stock_name ?? '',
row.store_name ?? '',
(row.barcodes ?? []).map((b) => b?.barcode ?? '').join('、'),
row.pick_zone_quantity ?? '',
row.storage_zone_quantity ?? '',
row.total_demand ?? '',

View File

@ -1047,7 +1047,27 @@ async function handleOpenPrintDialog() {
}
async function fetchPrintData(row: any, _index: number) {
// 打印时间:打开打印对话框时生成
const now = new Date()
const pad = (n: number) => String(n).padStart(2, '0')
const nowStr = `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(now.getDate())} ${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(now.getSeconds())}`
// 单据头:优先对齐出库单A5模板字段名(field_code),兼容列表字段名与 order 字段名
const formData: any = {
// 模板字段(供 getPreviewValue 按 field_code 取用)
delivery_order_code: row.stockout_order_code || row.delivery_order_code || '',
name: row.receiver_name || row.name || '',
mobile: row.receiver_mobile || row.mobile || '',
province: row.receiver_province || row.province || '',
city: row.receiver_city || row.city || '',
area: row.receiver_area || row.area || '',
detail_address: row.receiver_detail_address ?? row.detail_address ?? row.detailAddress ?? '',
logistics_name: row.express_name || row.logistics_name || '',
wave_no: row.wave_no || '',
create_at: row.created_at || row.create_at || '',
print_time: nowStr,
remark: row.remark || '',
// 其余单据信息
stockout_order_code: row.stockout_order_code || '',
express_code: row.express_code || '',
express_codes: row.express_codes || '',
@ -1057,7 +1077,6 @@ async function fetchPrintData(row: any, _index: number) {
sync_status: row.sync_status || '',
store_name: row.store_name || row['store.remask'] || row['store.store_remask'] || '',
total_order_lines: row.total_order_lines ?? '',
remark: row.remark || '',
order_create_time: row.order_create_time || '',
created_at: row.created_at || '',
updated_at: row.updated_at || '',
@ -1075,7 +1094,25 @@ async function fetchPrintData(row: any, _index: number) {
? payload.items
: []
formData.details = formatStockoutListItems(rows)
// 从 order 中取值:优先模板字段名,兼容列表字段名;取不到保留列表行值
const pick = (keys: string[], fallback: any) => {
for (const k of keys) {
if (order[k] !== undefined && order[k] !== null && String(order[k]).trim() !== '') return order[k]
}
return fallback
}
Object.assign(formData, {
delivery_order_code: pick(['delivery_order_code', 'stockout_order_code'], formData.delivery_order_code),
name: pick(['name', 'receiver_name'], formData.name),
mobile: pick(['mobile', 'receiver_mobile'], formData.mobile),
province: pick(['province', 'receiver_province'], formData.province),
city: pick(['city', 'receiver_city'], formData.city),
area: pick(['area', 'receiver_area'], formData.area),
detail_address: pick(['detail_address', 'detailAddress', 'receiver_detail_address', 'receiver_detail'], formData.detail_address),
logistics_name: pick(['logistics_name', 'express_name'], formData.logistics_name),
wave_no: pick(['wave_no'], formData.wave_no),
create_at: pick(['create_at', 'created_at'], formData.create_at),
stockout_order_code: order.stockout_order_code || formData.stockout_order_code,
express_code: order.express_code ?? formData.express_code,
express_codes: order.express_codes ?? formData.express_codes,

View File

@ -331,7 +331,11 @@ export function formatStockoutListItems(list: any[] = []) {
stock_unit: item.stock_unit ?? snap.stock_unit ?? '',
actual_qty: item.actual_qty ?? item.actual_quantity ?? '',
batch_no: item.batch_no ?? '',
remark: item.remark ?? ''
remark: item.remark ?? '',
// 打印模板(出库单A5)表格列所需字段
plan_qty: item.plan_qty ?? item.plan_quantity ?? '',
actual_price: item.actual_price ?? item.price ?? '',
detail_remark: item.detail_remark ?? item.remark ?? ''
}
})
}

View File

@ -2199,12 +2199,14 @@ async function submitCreateUser() {
createUserDialog.visible = false
if (created && password) {
// 仅本次新建账号时返回初始明文密码
const username = String(data?.username ?? createUserForm.username ?? '').trim()
const copyText = `地址:https://wms.wms.gztbyc.com/\n账号:${username}\n密码:${password}`
ElMessageBox.alert(
`用户名:${data?.username ?? createUserForm.username}\n初始密码:${password}`,
copyText,
'创建成功',
{ confirmButtonText: '复制密码并关闭', type: 'success' }
{ confirmButtonText: '复制并关闭', type: 'success' }
).then(() => {
navigator.clipboard?.writeText(password).catch(() => {})
navigator.clipboard?.writeText(copyText).catch(() => {})
}).catch(() => {})
} else {
ElMessage.success(created ? '创建成功' : '账号已存在,已为货主授权')