diff --git a/dist.tar.gz b/dist.tar.gz index 6a414b9c..80bc39d6 100644 Binary files a/dist.tar.gz and b/dist.tar.gz differ diff --git a/src/api/system/apiApp.ts b/src/api/apiapp/apiapp.ts similarity index 100% rename from src/api/system/apiApp.ts rename to src/api/apiapp/apiapp.ts diff --git a/src/api/inbox/inbox.ts b/src/api/inbox/inbox.ts new file mode 100644 index 00000000..9d015a0c --- /dev/null +++ b/src/api/inbox/inbox.ts @@ -0,0 +1,116 @@ +import request from '@/utils/request' + +const v = '1.0' + +// ============================================================ +// 站内信模块 API +// ============================================================ + +/** 站内信列表查询参数 */ +export interface InboxListParams { + direction?: string // 消息方向筛选:inbound(收件)/ outbound(回信) + pushStatus?: number // 推送状态筛选:0=待推送 1=推送中 2=已送达 3=失败 + targetChannel?: string // 目标渠道筛选:wecom / dingtalk / feishu / warehouse_api / webhook + keyword?: string // 关键词搜索,模糊匹配 ext_id 和 ref_code + page?: number // 页码,默认 1 + pageSize?: number // 每页数量,默认 20,最大 200 +} + +/** 站内信消息列表(inbox.list) */ +export function inboxList(data: InboxListParams = {}) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'inbox.list', + v, + timestamp: Date.now() + }, + data, + isSystemApi: true + } as any) +} + +/** 站内信消息详情(inbox.detail) */ +export function inboxDetail(id: number) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'inbox.detail', + v, + timestamp: Date.now() + }, + data: { id }, + isSystemApi: true + } as any) +} + +/** 站内信对话链查询(inbox.thread) */ +export function inboxThread(id: number) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'inbox.thread', + v, + timestamp: Date.now() + }, + data: { id }, + isSystemApi: true + } as any) +} + +/** 站内信回信参数 */ +export interface InboxReplyParams { + parentId: number // 原消息ID(回信指向的原消息) + targetChannel: string // 目标渠道:wecom / dingtalk / feishu / warehouse_api / webhook + targetType?: string // 目标类型:im / api / webhook,默认继承原消息的 target_type + extData?: Record // 透传数据,默认继承原消息的 ext_data + flags?: Record // 处理标记 +} + +/** 系统回信(inbox.reply) */ +export function inboxReply(data: InboxReplyParams) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'inbox.reply', + v, + timestamp: Date.now() + }, + data, + isSystemApi: true + } as any) +} + +/** 手动重推失败消息(inbox.retry) */ +export function inboxRetry(id: number) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'inbox.retry', + v, + timestamp: Date.now() + }, + data: { id }, + isSystemApi: true + } as any) +} + +/** 站内信推送统计(inbox.stats) */ +export function inboxStats(direction?: string) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'inbox.stats', + v, + timestamp: Date.now() + }, + data: direction !== undefined ? { direction } : {}, + isSystemApi: true + } as any) +} diff --git a/src/api/order.index/orderindex.ts b/src/api/order.index/orderindex.ts index 231498e0..85eabff4 100644 --- a/src/api/order.index/orderindex.ts +++ b/src/api/order.index/orderindex.ts @@ -10,6 +10,12 @@ export type OrderListParams = { page_size?: number size?: number } + /** + * 统一 where 条件对象(推荐 { operator, value, type } 标准结构,历史简写自动标准化)。 + * - 禁止传入 warehouse_id / warehouseId(由后端根据当前登录仓库上下文自动注入)。 + * - 虚拟字段:buyer_message_has(买家留言筛选,value=true 有留言/value=false 无留言)、 + * express_numbers / waybill_codes(运单号筛选)。 + */ where?: Record sort?: { sortField?: string @@ -28,7 +34,9 @@ export type OrderListPagination = { hasNext?: boolean } -/** order.list 响应 data 结构 */ +/** order.list 响应 data 结构 + * - list 每条 raw 行数据新增 store_remark(货主备注)字段 + */ export type OrderWorkbenchListResponse = { list: any[] pagination: OrderListPagination diff --git a/src/api/order.wave/orderwave.ts b/src/api/order.wave/orderwave.ts index b2aa2a40..990f0b52 100644 --- a/src/api/order.wave/orderwave.ts +++ b/src/api/order.wave/orderwave.ts @@ -398,20 +398,73 @@ export type WaveStrategyQuickScanTaskProgressResponse = { duration_ms?: number } +/** order.wave.waveStrategyFallbackOrderList where 白名单字段 */ +export type WaveStrategyFallbackOrderListWhere = { + /** 订单 ID(等值匹配) */ + id?: string | number + /** 发货单号(模糊匹配),兼容 deliveryNo */ + delivery_no?: string + deliveryNo?: string + /** 运单号(模糊匹配),兼容 trackingNo */ + tracking_no?: string + trackingNo?: string + /** 商品种类数下限 */ + items_count_min?: number + /** 商品种类数上限 */ + items_count_max?: number + /** 商品总数下限 */ + items_total_min?: number + /** 商品总数上限 */ + items_total_max?: number + /** 系统物流名称(模糊匹配) */ + sys_logistics_name?: string + /** 货主名称(模糊匹配) */ + store_name?: string + /** 货主(等值匹配) */ + owner_name?: string + /** 省份(模糊匹配) */ + province?: string + /** 系统平台名称(模糊匹配) */ + sys_platform_name?: string + /** 买家留言筛选(虚拟字段:true=有留言,false=无留言) */ + buyer_message_has?: boolean + /** 禁止传入 */ + warehouse_id?: never + warehouseId?: never +} + export type WaveStrategyFallbackOrderListParams = { + /** 分页参数,仅支持 page / pageSize */ pagination?: { page?: number pageSize?: number - currentPage?: number - page_size?: number - size?: number } - where?: Record + /** + * 筛选白名单字段。 + * 仅支持上述 where 类型中声明的字段,禁止传入 warehouse_id / warehouseId。 + * 若传入未列出的字段或禁止字段,接口返回 400。 + */ + where?: WaveStrategyFallbackOrderListWhere } -/** 不符合波次策略订单行;含接口新增的 item_snapshot(商品名称*数量|…) */ +/** 不符合波次策略订单行(回退候选订单简要列表)。 + * 该接口内置固定筛选:step != 0、wave_id = 0、wave_scan_result = 2。 + * - item_snapshot:商品名称*数量拼接快照(如 "商品A*2|商品B*1") + */ export type WaveStrategyFallbackOrderListRow = Record & { + id?: number | string + delivery_no?: string + tracking_no?: string + sys_logistics_name?: string + store_name?: string + owner_name?: string + province?: string + sys_platform_name?: string + items_count?: number | string + items_total?: number | string + buyer_message?: string item_snapshot?: string + store_remark?: string } export type WaveStrategyFallbackOrderListPagination = { diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index 7a9f996c..1184ee8d 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -1209,7 +1209,7 @@ export const deliveryTimeRangeScanField = scanBasicField({ label: '配送时间' export const placeOrderTimeRangeScanField = scanBasicField({ label: '下单时间', value: 'place_order_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' }) +export const buyerMessageScanField = scanBasicField({ label: '留言', value: 'buyer_message', type: 'text', defaultOperator: 'like' }) /** 可复用 ScanBox 字段片段(工作流程) */ export const orderStatusScanField = (options: Array<{ label: string; value: string }>) => @@ -1324,44 +1324,54 @@ export function fillStoreScanFieldOptions(availableFields: any[], rawStores: any if (field) field.options = mapStoreListToSelectOptions(rawStores) } +// === ScanBox 筛选分组常量 === +const SCAN_QUICK_FILTER_GROUP = '快速筛选' +const SCAN_ORDER_INFO_GROUP = '订单信息' +const SCAN_PROCESS_STATUS_GROUP = '流程状态' +const SCAN_RECEIVING_INFO_GROUP = '收货信息' +const SCAN_TIME_GROUP = '时间' + // deliveryOrder相关配置 export const deliveryAvailableFields = [ - // 基础信息 - storeScanField, - orderIdScanField, - orderQuickSearchScanField, - // deliveryOrderCodeScanField, - sourceOrderCodesScanField, - orderFlagScanField, - waveAssignmentScanField, - waveNoScanField, - shopNickScanField, - sysPlatformNameScanField, - receiverNameScanField, - receiverMobileScanField, - buyerMessageHasScanField, - buyerMessageScanField, - logisticsNameScanField, - expressCompanyScanField, - waybillCodesScanField, - isUrgencyScanField, - createAtRangeScanField, - payTimeRangeScanField, - deliveryTimeRangeScanField, - // 工作流程(按订单作业顺序,对齐 deliveryColumns 状态列) - orderStatusScanField(pendingOrderStatusFilterOptions), - syncStatusScanField, - inspectionStatusScanField, - recheckStatusScanField, - storageStatusScanField, - postStatusScanField, - outboundStatusScanField, - pickStatusScanField, - packStatusScanField, - printStatusScanField, - claimStatusScanField, - lockStatusScanField, - interceptStatusScanField, + // 快速筛选 + { ...storeScanField, group: SCAN_QUICK_FILTER_GROUP }, + { ...isUrgencyScanField, group: SCAN_QUICK_FILTER_GROUP }, + { ...waveAssignmentScanField, group: SCAN_QUICK_FILTER_GROUP }, + // 订单信息 + { ...orderQuickSearchScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...orderIdScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...waybillCodesScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP }, + // 流程状态 + { ...orderStatusScanField(pendingOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP }, + { ...outboundStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...inspectionStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...recheckStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...storageStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...postStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...printStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...pickStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...packStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...claimStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...lockStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...interceptStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + // 订单信息 + { ...orderFlagScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...shopNickScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...sysPlatformNameScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...logisticsNameScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, + // 收货信息 + { ...receiverNameScanField, group: SCAN_RECEIVING_INFO_GROUP }, + { ...receiverMobileScanField, group: SCAN_RECEIVING_INFO_GROUP }, + { ...buyerMessageHasScanField, group: SCAN_RECEIVING_INFO_GROUP }, + { ...buyerMessageScanField, group: SCAN_RECEIVING_INFO_GROUP }, + // 时间 + { ...createAtRangeScanField, group: SCAN_TIME_GROUP }, + { ...payTimeRangeScanField, group: SCAN_TIME_GROUP }, + { ...deliveryTimeRangeScanField, group: SCAN_TIME_GROUP }, ] /** upper-table 列点击复制:`copy` 仅复制;`copyQr` 复制并弹出快递单号二维码 */ @@ -1415,6 +1425,7 @@ export const deliveryColumns = applyOrderListCopyActions([ { prop: 'name', label: '收件人', width: '100' }, { prop: 'mobile', label: '电话', width: '120' }, { prop: 'buyer_message', label: '买家留言', minWidth: '180' }, + { prop: 'seller_message', label: '卖家留言', minWidth: '180' }, { prop: 'province', label: '省份', width: '90' }, { prop: 'city', label: '城市', width: '90' }, { prop: 'area', label: '区/县', width: '90' }, @@ -1498,10 +1509,7 @@ export const deliverybuttonList: any[] = [ /** deliveryOrder */ export const deliveryOrderToolbarButtonKeys = [ - 'refresh', - 'deliveryExport', - 'columnConfig', - 'toggleDetail', + ...simpleListToolbarButtonKeys, 'batchPrint', 'allocateSubOrderNumber', ] @@ -1509,27 +1517,30 @@ export const deliveryOrderToolbarButtons = pickToolbarButtons(deliveryOrderToolb // revieworder相关配置 export const reviewAvailableFields = [ - // 基础信息 - storeScanField, - orderIdScanField, - orderQuickSearchScanField, - // deliveryOrderCodeScanField, - sourceOrderCodesScanField, - waveAssignmentScanField, - waveNoScanField, - shopNickScanField, - sysPlatformCodeScanField, - receiverNameScanField, - receiverMobileScanField, - buyerMessageHasScanField, - buyerMessageScanField, - expressCompanyScanField, - isUrgencyScanField, - createAtRangeScanField, - // 工作流程(按订单作业顺序) - orderStatusScanField(reviewOrderStatusFilterOptions), - syncStatusScanField, - recheckStatusScanField, + // 快速筛选 + { ...storeScanField, group: SCAN_QUICK_FILTER_GROUP }, + { ...isUrgencyScanField, group: SCAN_QUICK_FILTER_GROUP }, + { ...waveAssignmentScanField, group: SCAN_QUICK_FILTER_GROUP }, + // 订单信息 + { ...orderQuickSearchScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...orderIdScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP }, + // 流程状态 + { ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...recheckStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...orderStatusScanField(reviewOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP }, + // 订单信息 + { ...shopNickScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...sysPlatformCodeScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, + // 收货信息 + { ...receiverNameScanField, group: SCAN_RECEIVING_INFO_GROUP }, + { ...receiverMobileScanField, group: SCAN_RECEIVING_INFO_GROUP }, + { ...buyerMessageHasScanField, group: SCAN_RECEIVING_INFO_GROUP }, + { ...buyerMessageScanField, group: SCAN_RECEIVING_INFO_GROUP }, + // 时间 + { ...createAtRangeScanField, group: SCAN_TIME_GROUP }, ] export const reviewColums = applyOrderListCopyActions([ @@ -1554,6 +1565,7 @@ export const reviewColums = applyOrderListCopyActions([ { prop: 'operate_time', label: '审核时间', width: '165', formatter: orderTimeFormatter }, { prop: 'create_at', label: '创建时间', width: '165', formatter: orderTimeFormatter }, { prop: 'buyer_message', label: '买家留言', minWidth: '180' }, + { prop: 'seller_message', label: '卖家留言', minWidth: '180' }, ]) export const reviewOrderDetail = [ @@ -1658,39 +1670,42 @@ export const outboundToolbarButtons = pickToolbarButtons(outboundToolbarButtonKe // pendingOrder相关配置 export const pendingAvailableFields = [ - // 基础信息 - storeScanField, - orderIdScanField, - pendingOrderQuickSearchScanField, - // pendingOrderCodeScanField, - sourceOrderCodesScanField, - orderFlagScanField, - waveAssignmentScanField, - waveNoScanField, - shopNickScanField, - sysPlatformNameScanField, - logisticsNameScanField, - expressCompanyScanField, - waybillCodesScanField, - receiverNameScanField, - receiverMobileScanField, - receiverProvinceScanField, - receiverCityScanField, - receiverAreaScanField, - buyerMessageHasScanField, - buyerMessageScanField, - isUrgencyScanField, - placeOrderTimeRangeScanField, - createAtRangeScanField, - // 工作流程(按订单作业顺序) - orderStatusScanField(pendingOrderStatusFilterOptions), - syncStatusScanField, - recheckStatusScanField, - storageStatusScanField, - postStatusScanField, - pickStatusScanField, - packStatusScanField, - printStatusScanField, + // 快速筛选 + { ...storeScanField, group: SCAN_QUICK_FILTER_GROUP }, + { ...isUrgencyScanField, group: SCAN_QUICK_FILTER_GROUP }, + { ...waveAssignmentScanField, group: SCAN_QUICK_FILTER_GROUP }, + // 订单信息 + { ...pendingOrderQuickSearchScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...orderIdScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...waybillCodesScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP }, + // 流程状态 + { ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...recheckStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...storageStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...postStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...pickStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...packStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...printStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...orderStatusScanField(pendingOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP }, + // 订单信息 + { ...orderFlagScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...shopNickScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...sysPlatformNameScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...logisticsNameScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, + // 收货信息 + { ...receiverNameScanField, group: SCAN_RECEIVING_INFO_GROUP }, + { ...receiverMobileScanField, group: SCAN_RECEIVING_INFO_GROUP }, + { ...receiverProvinceScanField, group: SCAN_RECEIVING_INFO_GROUP }, + { ...receiverCityScanField, group: SCAN_RECEIVING_INFO_GROUP }, + { ...receiverAreaScanField, group: SCAN_RECEIVING_INFO_GROUP }, + { ...buyerMessageHasScanField, group: SCAN_RECEIVING_INFO_GROUP }, + { ...buyerMessageScanField, group: SCAN_RECEIVING_INFO_GROUP }, + // 时间 + { ...placeOrderTimeRangeScanField, group: SCAN_TIME_GROUP }, + { ...createAtRangeScanField, group: SCAN_TIME_GROUP }, ] export const pendingCloums = [ @@ -1704,6 +1719,7 @@ export const pendingCloums = [ { prop: 'name', label: '收件人', width: '110' }, { prop: 'mobile', label: '电话', width: '120' }, { prop: 'buyer_message', label: '买家留言', minWidth: '180' }, + { prop: 'seller_message', label: '卖家留言', minWidth: '180' }, { prop: 'is_urgency', label: '是否紧急', width: '100' }, { prop: 'sync_status', label: '同步状态', width: '100' }, { prop: 'storage_status', label: '储位状态', width: '100' }, @@ -1711,7 +1727,7 @@ export const pendingCloums = [ { prop: 'pick_status', label: '拣货状态', width: '100' }, { prop: 'pack_status', label: '打包状态', width: '100' }, { prop: 'intercept_status', label: '拦截状态', width: '100', tag: true }, - { prop: 'express_numbers', label: '运单号', width: '160', formatter: waybillCodesFormatter }, + { prop: 'express_numbers', label: '快递单号', width: '160', formatter: waybillCodesFormatter }, { prop: 'items_count', label: '商品种类', width: '100' }, { prop: 'items_total', label: '商品总数', width: '100' }, { prop: 'items_weight', label: '商品重量(g)', width: '110' }, @@ -1738,6 +1754,7 @@ export const ORDER_LIST_FIELD_LABELS: Record = { order_type: '订单类型', buyer_nick: '买家昵称', buyer_message: '买家留言', + seller_message: '卖家留言', pre_delivery_order_code: '前置单号', delivery_time: '配送时间', items_weight: '商品重量(g)', @@ -1928,18 +1945,21 @@ export const workbenchStatusOptions = [ ] export const workbenchAvailableFields = [ - // 基础信息 - orderIdScanField, - deliveryOrderCodeScanField, - sourceOrderCodesScanField, - waveAssignmentScanField, - waveNoScanField, - buyerNickScanField, - buyerMessageHasScanField, - buyerMessageScanField, - isUrgencyScanField, - // 工作流程 - orderStatusScanField(workbenchStatusOptions), + // 快速筛选 + { ...isUrgencyScanField, group: SCAN_QUICK_FILTER_GROUP }, + { ...waveAssignmentScanField, group: SCAN_QUICK_FILTER_GROUP }, + // 订单信息 + { ...deliveryOrderCodeScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...orderIdScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP }, + // 流程状态 + { ...orderStatusScanField(workbenchStatusOptions), group: SCAN_PROCESS_STATUS_GROUP }, + // 订单信息 + { ...buyerNickScanField, group: SCAN_ORDER_INFO_GROUP }, + // 收货信息 + { ...buyerMessageHasScanField, group: SCAN_RECEIVING_INFO_GROUP }, + { ...buyerMessageScanField, group: SCAN_RECEIVING_INFO_GROUP }, ] export const workbenchColumns = applyOrderListCopyActions([ @@ -1955,6 +1975,7 @@ export const workbenchColumns = applyOrderListCopyActions([ { prop: 'name', label: '收件人', minWidth: 100 }, { prop: 'mobile', label: '电话', minWidth: 120 }, { prop: 'buyer_message', label: '买家留言', minWidth: 180 }, + { prop: 'seller_message', label: '卖家留言', minWidth: 180 }, { prop: 'is_urgency', label: '是否紧急', minWidth: 100 }, { prop: 'status', label: '订单状态', minWidth: 120, formatter: (row: any) => translateOrderField('status', row.status) }, { prop: 'sync_status', label: '同步状态', minWidth: 110 }, @@ -1988,33 +2009,35 @@ export const workbenchBadgeItems = [ // expectionOrder相关配置 export const expectionOrderAvailableFields = [ - // 基础信息 - storeScanField, - orderIdScanField, - orderQuickSearchScanField, - // exceptionOrderCodeScanField, - // deliveryOrderCodeScanField, - sourceOrderCodesScanField, - orderFlagScanField, - waveAssignmentScanField, - waveNoScanField, - logisticsNameScanField, - expressCompanyScanField, - expressCodeScanField, - buyerMessageHasScanField, - buyerMessageScanField, - isUrgencyScanField, - createAtRangeScanField, - // 工作流程(按订单作业顺序) - orderStatusScanField(exceptionOrderStatusFilterOptions), - syncStatusScanField, - recheckStatusScanField, - storageStatusScanField, - postStatusScanField, - pickStatusScanField, - packStatusScanField, - printStatusScanField, - interceptStatusScanField, + // 快速筛选 + { ...storeScanField, group: SCAN_QUICK_FILTER_GROUP }, + { ...isUrgencyScanField, group: SCAN_QUICK_FILTER_GROUP }, + { ...waveAssignmentScanField, group: SCAN_QUICK_FILTER_GROUP }, + // 订单信息 + { ...orderQuickSearchScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...orderIdScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...expressCodeScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP }, + // 流程状态 + { ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...storageStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...postStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...pickStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...packStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...interceptStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...recheckStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...printStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...orderStatusScanField(exceptionOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP }, + // 订单信息 + { ...orderFlagScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...logisticsNameScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, + // 收货信息 + { ...buyerMessageHasScanField, group: SCAN_RECEIVING_INFO_GROUP }, + { ...buyerMessageScanField, group: SCAN_RECEIVING_INFO_GROUP }, + // 时间 + { ...createAtRangeScanField, group: SCAN_TIME_GROUP }, ] export const expectionColumns = [ @@ -2036,6 +2059,7 @@ export const expectionColumns = [ { prop: 'name', label: '收件人', width: '110' }, { prop: 'mobile', label: '电话', width: '120' }, { prop: 'buyer_message', label: '买家留言', minWidth: '180' }, + { prop: 'seller_message', label: '卖家留言', minWidth: '180' }, { prop: 'logistics_name', label: '快递', width: '120' }, { prop: 'pre_delivery_order_code', label: '前置单号', width: '140' }, { prop: 'order_flag', label: '订单标记', minWidth: '260' }, @@ -2101,28 +2125,29 @@ export const expectionOrderbuttonList: any[] = [ // deliveryException相关配置 export const archiveAvailableFields = [ - // 基础信息 - storeScanField, - orderIdScanField, - orderQuickSearchScanField, - // exceptionOrderCodeScanField, - // deliveryOrderCodeScanField, - sourceOrderCodesScanField, - waveAssignmentScanField, - waveNoScanField, - shopNickScanField, - expressCompanyScanField, - receiverNameScanField, - receiverMobileScanField, - buyerMessageHasScanField, - buyerMessageScanField, - isUrgencyScanField, - // 工作流程(按订单作业顺序) - orderStatusScanField(archiveOrderStatusFilterOptions), - syncStatusScanField, - outboundStatusScanField, - pickStatusScanField, - packStatusScanField, + // 快速筛选 + { ...storeScanField, group: SCAN_QUICK_FILTER_GROUP }, + { ...isUrgencyScanField, group: SCAN_QUICK_FILTER_GROUP }, + { ...waveAssignmentScanField, group: SCAN_QUICK_FILTER_GROUP }, + // 订单信息 + { ...orderQuickSearchScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...orderIdScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP }, + // 流程状态 + { ...orderStatusScanField(archiveOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP }, + { ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...outboundStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...pickStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...packStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + // 订单信息 + { ...shopNickScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, + // 收货信息 + { ...receiverNameScanField, group: SCAN_RECEIVING_INFO_GROUP }, + { ...receiverMobileScanField, group: SCAN_RECEIVING_INFO_GROUP }, + { ...buyerMessageHasScanField, group: SCAN_RECEIVING_INFO_GROUP }, + { ...buyerMessageScanField, group: SCAN_RECEIVING_INFO_GROUP }, ] export const archiveColumns = applyOrderListCopyActions([ @@ -2137,6 +2162,7 @@ export const archiveColumns = applyOrderListCopyActions([ { prop: 'name', label: '收件人', width: '120' }, { prop: 'mobile', label: '电话', width: '120' }, { prop: 'buyer_message', label: '买家留言', minWidth: '180' }, + { prop: 'seller_message', label: '卖家留言', minWidth: '180' }, { prop: 'items_weight', label: '商品重量(g)', width: '110' }, { prop: 'logistics_name', label: '快递', width: '120' }, { prop: 'status', label: '订单状态', width: '100', formatter: (row: any) => translateOrderField('status', row.status) }, diff --git a/src/views/order/waveOrder/FallbackOrderListPanel.vue b/src/views/order/waveOrder/FallbackOrderListPanel.vue index 0d4dc634..6bca0fd9 100644 --- a/src/views/order/waveOrder/FallbackOrderListPanel.vue +++ b/src/views/order/waveOrder/FallbackOrderListPanel.vue @@ -270,7 +270,8 @@ function sanitizeFallbackOrderWhere(where: Record) { store_name: 'store_name', owner_name: 'owner_name', province: 'province', - sys_platform_name: 'sys_platform_name' + sys_platform_name: 'sys_platform_name', + buyer_message_has: 'buyer_message_has' } const nextWhere: Record = {} Object.keys(where || {}).forEach((key) => { diff --git a/src/views/order/waveOrder/GroupWaveBatchListPanel.vue b/src/views/order/waveOrder/GroupWaveBatchListPanel.vue index 63a16bf9..b501febe 100644 --- a/src/views/order/waveOrder/GroupWaveBatchListPanel.vue +++ b/src/views/order/waveOrder/GroupWaveBatchListPanel.vue @@ -3243,7 +3243,8 @@ function sanitizeFallbackOrderWhere(where: Record) { store_name: 'store_name', owner_name: 'owner_name', province: 'province', - sys_platform_name: 'sys_platform_name' + sys_platform_name: 'sys_platform_name', + buyer_message_has: 'buyer_message_has' } const nextWhere: Record = {} Object.keys(where || {}).forEach((key) => { diff --git a/src/views/order/waveOrder/component/WavePlatformPrintPreviewDialog.vue b/src/views/order/waveOrder/component/WavePlatformPrintPreviewDialog.vue index e2fdb29e..1926f9b2 100644 --- a/src/views/order/waveOrder/component/WavePlatformPrintPreviewDialog.vue +++ b/src/views/order/waveOrder/component/WavePlatformPrintPreviewDialog.vue @@ -30,61 +30,92 @@
- 快递打印机(留空则使用默认打印机) + 快递打印机(点击选中,留空则使用默认打印机)
-
-
-
快递
-
打印机
-
+
-
- {{ item.label }} -
-
- + {{ item.label }} + - +
+ +
+
- + class="wave-print-printer-tile wave-print-printer-tile--compact" + :class="{ 'is-selected': expressPrinterOverrides[item.key] === printer.value }" + @click="expressPrinterOverrides[item.key] = expressPrinterOverrides[item.key] === printer.value ? '' : printer.value" + > + {{ printer.label }} + + + +
+
+
+
+ 暂无可选打印机
@@ -127,7 +158,17 @@ {{ platform.platform_name }} {{ platform.platform_display }}
- 订单 {{ platform.order_count }} +
+ + {{ getPlatformComponentName(platform) }}{{ isComponentConnected(getPlatformComponentName(platform)!) ? '' : '(未连接)' }} + + 订单 {{ platform.order_count }} +
@@ -204,11 +245,14 @@ + + + +