From d45cd19361175f2ac31280e9688667b4618e1f71 Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Tue, 29 Sep 2026 20:52:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../overseas-warehouse/api/returnOrders.ts | 8 +-
.../views/ReturnOrdersView.vue | 101 +++++++++++++-----
2 files changed, 79 insertions(+), 30 deletions(-)
diff --git a/src/modules/overseas-warehouse/api/returnOrders.ts b/src/modules/overseas-warehouse/api/returnOrders.ts
index 5374106..45655aa 100644
--- a/src/modules/overseas-warehouse/api/returnOrders.ts
+++ b/src/modules/overseas-warehouse/api/returnOrders.ts
@@ -10,10 +10,12 @@ export interface ReturnOrderItem {
skuCode: string; productNameZh?: string; expectedQuantity: number; receivedQuantity: number
}
export interface ReturnReceipt {
- receiptNo: string; receiptBatchNo: string; palletCode: string; trackingNo?: string; startedBy: 'RETURN_NO' | 'SKU'
- receivedQuantity: number; operatorName?: string; signedAt: string
+ receiptNo: string; receiptBatchNo: string; palletCode?: string; trackingNo?: string; startedBy: 'RETURN_NO' | 'SKU'
+ receivedQuantity: number; operatorName?: string; signedAt: string; unitType: 'PALLET' | 'BOX' | 'PARCEL'; unitCode?: string; boxCount: number
+ items: Array<{ skuCode: string; productNameZh?: string; quantity: number; boxCount: number }>; cartonMark?: string; printableHtml?: string
+ labels?: Array<{ cartonMark: string; printableHtml: string }>
}
-export interface ReturnPallet { palletCode: string; skuTypes: number; totalQuantity: number; items: Array<{ skuCode: string; productNameZh?: string; quantity: number }> }
+export interface ReturnPallet { palletCode: string; unitType: 'PALLET' | 'BOX'; unitCode: string; skuTypes: number; totalQuantity: number; totalBoxCount: number; items: Array<{ skuCode: string; productNameZh?: string; quantity: number; boxCount: number }> }
export interface ReturnPhoto { fileId: number; fileName: string; contentType: string; sizeBytes: number }
export interface ReturnOrderDetail { order: ReturnOrderSummary; remark?: string; items: ReturnOrderItem[]; receipts: ReturnReceipt[]; pallets: ReturnPallet[]; photos: ReturnPhoto[] }
export interface ReturnOrderCreate {
diff --git a/src/modules/overseas-warehouse/views/ReturnOrdersView.vue b/src/modules/overseas-warehouse/views/ReturnOrdersView.vue
index cda9654..8a049cf 100644
--- a/src/modules/overseas-warehouse/views/ReturnOrdersView.vue
+++ b/src/modules/overseas-warehouse/views/ReturnOrdersView.vue
@@ -10,6 +10,7 @@ import { useAuthStore } from '@/modules/auth/public'
import { getMerchantWarehouses, type MerchantWarehouse } from '@/modules/first-leg/public'
import { createIdempotencyKey } from '@/utils/idempotencyKey'
import { createReturnOrder, downloadReturnPhoto, getReturnOrder, listReturnOrders, updateReturnOrder, type ReturnOrderDetail, type ReturnOrderSummary, type ReturnReceipt } from '../api/returnOrders'
+import { getReturnInventoryLabel } from '../api/returnInventory'
const props = withDefaults(defineProps<{ createPage?: boolean; detailPage?: boolean; returnNo?: string }>(), { createPage: false, detailPage: false, returnNo: '' })
const router = useRouter()
@@ -54,19 +55,21 @@ const tableColumns: DataTableColumn[] = [
{ key: 'createdAt', label: '创建时间', slotName: 'createdAt', width: 180 },
]
const itemColumns: DataTableColumn[] = [
- { prop: 'skuCode', label: 'SKU', minWidth: 190 },
- { prop: 'productNameZh', label: '中文品名', minWidth: 220 },
- { prop: 'expectedQuantity', label: '预报数量', width: 110 },
- { prop: 'receivedQuantity', label: '实收数量', width: 110 },
+ { prop: 'skuCode', label: 'SKU', minWidth: 150 },
+ { prop: 'productNameZh', label: '中文品名', minWidth: 180 },
+ { prop: 'expectedQuantity', label: '预报数量', width: 100 },
+ { prop: 'receivedQuantity', label: '实收数量', width: 100 },
]
const receiptColumns: DataTableColumn[] = [
- { prop: 'receiptBatchNo', label: '批次号', minWidth: 170 },
- { prop: 'receiptNo', label: '签收单号', minWidth: 170 },
- { prop: 'palletCode', label: '托盘码', minWidth: 190 },
- { key: 'trackingNo', label: '快递单号', slotName: 'trackingNo', minWidth: 160 },
- { key: 'startedBy', label: '开始方式', slotName: 'startedBy', width: 110 },
- { prop: 'receivedQuantity', label: '实收', width: 90 },
- { key: 'signedAt', label: '签收时间', slotName: 'signedAt', minWidth: 180 },
+ { prop: 'receiptBatchNo', label: '批次号', minWidth: 145 },
+ { prop: 'receiptNo', label: '签收单号', minWidth: 145 },
+ { key: 'unitType', label: '实物类型', slotName: 'unitType', width: 90 },
+ { prop: 'unitCode', label: '实物编码', minWidth: 160 },
+ { key: 'trackingNo', label: '快递单号', slotName: 'trackingNo', minWidth: 140 },
+ { key: 'startedBy', label: '开始方式', slotName: 'startedBy', width: 100 },
+ { prop: 'receivedQuantity', label: '实收', width: 80 },
+ { prop: 'boxCount', label: '箱数', width: 70 },
+ { key: 'signedAt', label: '签收时间', slotName: 'signedAt', minWidth: 165 },
]
interface SkuDraft { id: number; skuCode: string; productNameZh: string; expectedQuantity: number }
let skuSequence = 0
@@ -172,6 +175,35 @@ function previewPhoto(fileId: string | number) {
const url = photoUrls[String(fileId)]
if (url) window.open(url, '_blank', 'noopener')
}
+async function printReturnLabel(receipt: ReturnReceipt) {
+ if (!receipt.cartonMark) return
+ const popup = window.open('', '_blank')
+ if (!popup) { ElMessage.warning('请允许浏览器打开打印窗口'); return }
+ popup.opener = null
+ try {
+ const labels = receipt.labels?.length
+ ? receipt.labels
+ : [{ cartonMark: receipt.cartonMark, printableHtml: receipt.printableHtml || (await getReturnInventoryLabel(receipt.cartonMark)).printableHtml }]
+ const printableHtml = labels.length === 1
+ ? labels[0].printableHtml
+ : `退货箱唛${labels.map((label) => {
+ const html = label.printableHtml || ''
+ const bodyStart = html.indexOf('', bodyStart) + 1
+ const bodyEnd = html.lastIndexOf('')
+ const content = contentStart > 0 && bodyEnd > contentStart ? html.slice(contentStart, bodyEnd) : html
+ return ``
+ }).join('')}