diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index d05bb9f4..3818f309 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -364,7 +364,7 @@ export type OrderExportColumnOption = { } /** - * order.export 全部可导出字段(共 54 个,对齐接口枚举): + * order.export 全部可导出字段(共 55 个,对齐接口枚举): * 仅 waybill 模式输出:系统订单号、外部订单号、平台单号、抓取波次号、商品明细; * 仅 item 模式输出:订单ID、订单号、外部单号、波次号、仓库商品名称、商品条码、商品图片、数量; * 其余为两种模式通用。 @@ -427,6 +427,7 @@ export const ORDER_EXPORT_ALL_COLUMNS: OrderExportColumnOption[] = [ // ===== 时间信息 ===== { 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: '时间信息' }, // ===== 留言备注 ===== @@ -1464,6 +1465,8 @@ export const createAtRangeScanField = scanBasicField({ label: '创建时间', va export const payTimeRangeScanField = scanBasicField({ label: '支付时间', value: 'pay_time', type: 'datetimerange' }) export const deliveryTimeRangeScanField = scanBasicField({ label: '配送时间', value: 'delivery_time', type: 'datetimerange' }) export const placeOrderTimeRangeScanField = scanBasicField({ label: '下单时间', value: 'place_order_time', type: 'datetimerange' }) +/** ScanBox:复核时间(订单表 recheck_time),区间查询输出 { operator: 'between', type: 'datetimerange', value: [start, end] } */ +export const recheckTimeRangeScanField = scanBasicField({ label: '复核时间', value: 'recheck_time', type: 'datetimerange' }) export const isUrgencyScanField = scanBasicField({ label: '是否紧急', value: 'is_urgency', type: 'select', options: isUrgencyFilterOptions }) export const buyerMessageHasScanField = scanBasicField({ label: '有无留言', value: 'buyer_message_has', type: 'select', options: buyerMessageHasFilterOptions }) export const buyerMessageScanField = scanBasicField({ label: '留言', value: 'buyer_message', type: 'text', defaultOperator: 'like' }) @@ -1706,6 +1709,7 @@ export const deliveryAvailableFields = [ { ...createAtRangeScanField, group: SCAN_TIME_GROUP }, { ...payTimeRangeScanField, group: SCAN_TIME_GROUP }, { ...deliveryTimeRangeScanField, group: SCAN_TIME_GROUP }, + { ...recheckTimeRangeScanField, group: SCAN_TIME_GROUP }, ] /** upper-table 列点击复制:`copy` 仅复制;`copyQr` 复制并弹出快递单号二维码 */ @@ -1808,6 +1812,7 @@ export const deliveryColumns = applyOrderListCopyActions([ { prop: 'operate_time', label: '操作时间', width: '160', formatter: orderTimeFormatter }, { prop: 'place_order_time', label: '下单时间', width: '160', formatter: orderTimeFormatter }, { prop: 'create_at', label: '创建时间', width: '160', formatter: orderTimeFormatter }, + { prop: 'recheck_time', label: '复核时间', width: '165', formatter: orderTimeFormatter }, ]) /** 配送订单详情分区(与 orderDetailFullSections 一致) */ @@ -2075,6 +2080,7 @@ export const pendingAvailableFields = [ // 时间 { ...placeOrderTimeRangeScanField, group: SCAN_TIME_GROUP }, { ...createAtRangeScanField, group: SCAN_TIME_GROUP }, + { ...recheckTimeRangeScanField, group: SCAN_TIME_GROUP }, ] export const pendingCloums = [ @@ -2104,6 +2110,7 @@ export const pendingCloums = [ { prop: 'items_weight', label: '商品重量(g)', width: '110', sortable: 'custom' }, { prop: 'province', label: '省份', width: '100' }, { prop: 'create_at', label: '创建时间', width: '165', formatter: orderTimeFormatter, sortable: 'custom' }, + { prop: 'recheck_time', label: '复核时间', width: '165', formatter: orderTimeFormatter, sortable: 'custom' }, { prop: 'pay_time', label: '支付时间', width: '160', formatter: orderTimeFormatter, sortable: 'custom' }, { prop: 'place_order_time', label: '下单时间', width: '165', formatter: orderTimeFormatter, sortable: 'custom' }, { prop: 'create_channel', label: '来源', width: '120' }, @@ -2466,6 +2473,7 @@ export const expectionOrderAvailableFields = [ { ...buyerMessageScanField, group: SCAN_RECEIVING_INFO_GROUP }, // 时间 { ...createAtRangeScanField, group: SCAN_TIME_GROUP }, + { ...recheckTimeRangeScanField, group: SCAN_TIME_GROUP }, ] export const expectionColumns = [ @@ -2498,6 +2506,7 @@ export const expectionColumns = [ { prop: 'total_amount', label: '订单金额', width: '110', sortable: 'custom' }, { prop: 'pay_time', label: '支付时间', width: '165', formatter: orderTimeFormatter, sortable: 'custom' }, { prop: 'create_at', label: '创建时间', width: '165', formatter: orderTimeFormatter, sortable: 'custom' }, + { prop: 'recheck_time', label: '复核时间', width: '165', formatter: orderTimeFormatter, sortable: 'custom' }, ] export const expectionOrderDetail = [ @@ -2586,6 +2595,8 @@ export const archiveAvailableFields = [ { ...receiverMobileScanField, group: SCAN_RECEIVING_INFO_GROUP }, { ...buyerMessageHasScanField, group: SCAN_RECEIVING_INFO_GROUP }, { ...buyerMessageScanField, group: SCAN_RECEIVING_INFO_GROUP }, + // 时间 + { ...recheckTimeRangeScanField, group: SCAN_TIME_GROUP }, ] export const archiveColumns = applyOrderListCopyActions([ @@ -2606,6 +2617,7 @@ export const archiveColumns = applyOrderListCopyActions([ { prop: 'logistics_name', label: '快递', width: '120' }, { prop: 'status', label: '订单状态', width: '100', formatter: (row: any) => translateOrderField('status', row.status) }, { prop: 'create_at', label: '创建时间', width: '160' }, + { prop: 'recheck_time', label: '复核时间', width: '165', formatter: orderTimeFormatter }, { prop: 'updated_at', label: '归档时间', width: '160' }, ])