diff --git a/src/api/order.print/orderprint.ts b/src/api/order.print/orderprint.ts index 6232ac11..f171d365 100644 --- a/src/api/order.print/orderprint.ts +++ b/src/api/order.print/orderprint.ts @@ -19,10 +19,12 @@ export type GetWavePlatformPrintDataParams = { wave_ids: Array } -/** 接口文档:summary / wave_ids / platform_groups / order_list / ext */ +/** 接口文档:summary / wave_ids / waveGroups(主)/ platform_groups、order_list(兼容)/ ext */ export type WavePlatformPrintDataPayload = { summary?: Record wave_ids?: Array + /** 主返回:波次 → 平台 → 订单 */ + waveGroups?: unknown[] platform_groups?: unknown[] order_list?: Record[] ext?: Record diff --git a/src/api/print/print.ts b/src/api/print/print.ts index b76faeb4..e48df997 100644 --- a/src/api/print/print.ts +++ b/src/api/print/print.ts @@ -169,6 +169,26 @@ export function getPrintRecordItem(id: string | number) { }) } +/** print.send 请求体(与 print 模块接口一致) */ +export type PrintSendParams = { + computerId: string + count?: number + data: Record + printer: string + template: Record + /** 业务时间戳,可选;接口类型为 string */ + timestamp?: string + type: string +} + +/** print.send 业务响应字段(成功 code 多为 200,flag 为 success) */ +export type PrintSendResult = { + flag?: string + code?: number + message?: string + printId?: number +} + export function savePrinters(data: { defaultPrinter: string express?: Array> @@ -194,7 +214,11 @@ export function savePrinters(data: { }) } -export function sendPrint(data: Record) { +export function sendPrint(data: PrintSendParams) { + const body: PrintSendParams = { ...data } + if (body.timestamp !== undefined && body.timestamp !== null && typeof body.timestamp !== 'string') { + body.timestamp = String(body.timestamp) + } return request({ url: '/system', method: 'post', @@ -203,6 +227,6 @@ export function sendPrint(data: Record) { v, timestamp: stamp() }, - data + data: body }) } diff --git a/src/components/BatchReceivingPrintDialog.vue b/src/components/BatchReceivingPrintDialog.vue index cc36b620..a4a6b296 100644 --- a/src/components/BatchReceivingPrintDialog.vue +++ b/src/components/BatchReceivingPrintDialog.vue @@ -547,12 +547,12 @@ async function doPrint() { const selectedTemplateObj = templateOptions.value.find((item: any) => item.id === printSettings.template) || null const printPayload = { type: 'customize', - computerId: printSettings.station, + computerId: String(printSettings.station), printer: printSettings.printer, - template: selectedTemplateObj, - data: { ...printForm }, - timestamp: Date.now(), - size: 1 + template: (selectedTemplateObj || {}) as Record, + data: { ...printForm } as Record, + timestamp: String(Date.now()), + count: 1 } const res: any = await stationApi.sendPrint(printPayload) diff --git a/src/views/order/waveOrder/GroupWaveBatchListPanel.vue b/src/views/order/waveOrder/GroupWaveBatchListPanel.vue index ddee169f..1ccff3ff 100644 --- a/src/views/order/waveOrder/GroupWaveBatchListPanel.vue +++ b/src/views/order/waveOrder/GroupWaveBatchListPanel.vue @@ -383,7 +383,7 @@ {{ getGroupOrderItemSnapshotText(row) }} - +