ming #1

Merged
liufumingren merged 558 commits from ming into main 2026-11-18 16:13:25 +08:00
Showing only changes of commit 28c862b7c9 - Show all commits

View File

@ -30,6 +30,7 @@ const ORDER_EXPORT_COLUMNS = Object.freeze([
{ header: '外部订单号', key: 'delivery_order_code', width: 24 },
{ header: '平台单号', key: 'external_order_code', width: 24 },
{ header: '订单状态', key: 'status', width: 16 },
{ header: '拦截状态', key: 'intercept_status', width: 20 },
{ header: '抓取波次号', key: 'wave_no', width: 18 },
{ header: '波次序号', key: 'wave_index', width: 12 },
{ header: '货主', key: 'store_id', width: 20 },
@ -79,6 +80,7 @@ const ORDER_EXPORT_ITEM_COLUMNS = Object.freeze([
{ header: '订单号', key: 'delivery_order_code', width: 24 },
{ header: '外部单号', key: 'external_order_code', width: 24 },
{ header: '订单状态', key: 'status', width: 16 },
{ header: '拦截状态', key: 'intercept_status', width: 20 },
{ header: '波次号', key: 'wave_no', width: 18 },
{ header: '波次序号', key: 'wave_index', width: 12 },
{ header: '货主', key: 'store_id', width: 20 },
@ -454,6 +456,7 @@ class OrderExportService extends OrderBaseService {
delivery_order_code: this.normalizeExportCellValue(safeOrderRow.delivery_order_code),
external_order_code: this.normalizeExportCellValue(externalOrderCode),
status: translateStatus('status', safeOrderRow.status),
intercept_status: this.normalizeExportCellValue(safeOrderRow.intercept_status),
wave_no: this.normalizeExportCellValue(safeOrderRow.wave_no),
wave_index: this.normalizeExportCellValue(safeOrderRow.wave_index ?? 0),
store_id: this.normalizeExportCellValue(storeRemark || safeOrderRow.store_name || safeOrderRow.store_id),