diff --git a/src/api/order.deliveryorder/orderdeliveryOrder.ts b/src/api/order.deliveryorder/orderdeliveryOrder.ts index 20b3268b..8cbaea83 100644 --- a/src/api/order.deliveryorder/orderdeliveryOrder.ts +++ b/src/api/order.deliveryorder/orderdeliveryOrder.ts @@ -234,6 +234,20 @@ export function orderDeliveryOrderList(data: DeliveryOrderListParams = {}): Prom } as any) } +export function orderDeliveryOrder2bList(data: DeliveryOrderListParams = {}): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.deliveryOrder2b.list', + v, + timestamp: Date.now() + }, + data, + isSystemApi: true + } as any) +} + export function orderDeliveryOrderDetail(data: DeliveryOrderDetailParams): Promise { return request({ url: '/system', @@ -340,3 +354,7 @@ export const orderDeliveryOrder = { quickSearch: orderDeliveryOrderQuickSearch, summary: orderDeliveryOrderSummary, } + +export const orderDeliveryOrder2b = { + list: orderDeliveryOrder2bList +} diff --git a/src/api/order.pendingorder/orderpendingOrder.ts b/src/api/order.pendingorder/orderpendingOrder.ts index 4f4fe516..b4d04fe2 100644 --- a/src/api/order.pendingorder/orderpendingOrder.ts +++ b/src/api/order.pendingorder/orderpendingOrder.ts @@ -343,6 +343,71 @@ export function orderPendingOrderList(data: PendingOrderListParams = {}): Promis } as any); } +export function orderPendingOrder2bList(data: PendingOrderListParams = {}): Promise { + return request({ + url: "/system", + method: "post", + params: { + method: "order.pendingOrder2b.list", + v, + timestamp: Date.now(), + }, + data, + isSystemApi: true, + } as any); +} + +/** + * order.convertToB2b:待处理订单批量转 B2B 订单 + * - 仅查当前仓库 current 分表(wms_order_delivery_{warehouseId}),仓库取自登录上下文,禁止前端传入 + * - ids / order_ids / orderIds / id / order_id / orderId 均可,服务端转数组、仅保留正整数、去重,单次上限 200 + * - 不符合准入条件的订单静默跳过(不报错),原因见 skipped_reasons + */ +export type PendingOrderConvertToB2bParams = { + /** 订单ID集合(单值或数组均可,服务端统一转数组) */ + ids?: number[] | number; + order_ids?: number[] | number; + orderIds?: number[] | number; + id?: number; + order_id?: number; + orderId?: number; +}; + +/** order.convertToB2b 跳过原因项 */ +export type PendingOrderConvertToB2bSkippedReason = { + order_id: number; + delivery_order_code?: string; + /** 订单待审核 / 已复核 / 已拣货 / 已锁定 / 已拦截 / 已是B2B订单(已打印不拦截转换) */ + reason: string; +}; + +/** order.convertToB2b 响应 */ +export type PendingOrderConvertToB2bResponse = { + converted_order_ids: number[]; + converted_count: number; + skipped_order_ids: number[]; + skipped_count: number; + skipped_reasons: PendingOrderConvertToB2bSkippedReason[]; + /** 当前仓库 current 分表中查不到的订单 ID(已进配送/历史/外仓表,或不属于本仓) */ + not_found_order_ids: number[]; +}; + +export function orderPendingOrderConvertToB2b( + data: PendingOrderConvertToB2bParams, +): Promise { + return request({ + url: "/system", + method: "post", + params: { + method: "order.convertToB2b", + v, + timestamp: Date.now(), + }, + data, + isSystemApi: true, + } as any); +} + export function orderPendingOrderReverseReviewOrder( data: PendingOrderReverseReviewParams, ): Promise { @@ -820,6 +885,7 @@ export function orderPendingOrderUpdateRemark( export type OrderPendingOrderApi = { list: typeof orderPendingOrderList; + convertToB2b: typeof orderPendingOrderConvertToB2b; detail: typeof orderPendingOrderDetail; reverseReviewOrder: typeof orderPendingOrderReverseReviewOrder; markPendingOutboundOrder: typeof orderPendingOrderMarkPendingOutboundOrder; @@ -856,6 +922,7 @@ export type OrderPendingOrderApi = { export const orderPendingOrder: OrderPendingOrderApi = { list: orderPendingOrderList, + convertToB2b: orderPendingOrderConvertToB2b, detail: orderPendingOrderDetail, reverseReviewOrder: orderPendingOrderReverseReviewOrder, markPendingOutboundOrder: orderPendingOrderMarkPendingOutboundOrder, @@ -889,3 +956,7 @@ export const orderPendingOrder: OrderPendingOrderApi = { allocateSubOrderNumber: orderPendingOrderAllocateSubOrderNumber, allocateSubOrderNumberProgress: orderPendingOrderAllocateSubOrderNumberProgress, }; + +export const orderPendingOrder2b = { + list: orderPendingOrder2bList, +}; diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index dcf668ea..9146ae83 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -30,10 +30,10 @@ export const ORDER_PAGE_CONFIG = { */ singlePage: false, /** - * 本页 tab 缓存上限:本页共 8 个页签,需全量缓存; + * 本页 tab 缓存上限:本页共 10 个页签,需全量缓存; * 小于页签数会触发 KeepAlive LRU 抖动(切回时重建,比首次还慢) */ - tabCacheMax: 8 + tabCacheMax: 10 } // 通用翻译映射 @@ -556,6 +556,15 @@ export const ORDER_TOOLBAR_BUTTONS: Record = { disabledKey: 'noInterceptSelection', action: 'handleConfirmInterceptBatch' }, + /** 待处理订单批量转 B2B(order.convertToB2b):通过弹窗确认并展示逐单跳过原因 */ + convertToB2b: { + key: 'convertToB2b', + label: '转B2B订单', + size: 'small', + category: 'action', + disabledKey: 'hasNoSelection', + action: 'openConvertToB2bDialog' + }, batchLock: { key: 'batchLock', label: '批量锁定', size: 'small', category: 'action', loadingKey: 'batchAsyncTaskLoading', disabledKey: 'hasNoSelection', action: 'handleBatchLock' }, batchUnlock: { key: 'batchUnlock', label: '批量解锁', size: 'small', category: 'action', loadingKey: 'batchAsyncTaskLoading', disabledKey: 'hasNoSelection', action: 'handleBatchUnlock' }, batchPrint: { key: 'batchPrint', label: '批量打印', size: 'small', category: 'action', loadingKey: 'batchPrintLoading', disabledKey: 'hasNoSelection', action: 'handleBatchPrint' }, @@ -2222,6 +2231,14 @@ export const ORDER_LIST_FIELD_LABELS: Record = { items_weight: '商品重量(g)', waybill_codes: '运单号', weight_type: '重量类型', + /** B2B 待处理列表专属字段 */ + total_box_count: '总箱数', + pickup_plate_number: '提货车牌', + prep_remark: '备货备注', + prep_duration_seconds: '备货时长(秒)', + prep_at: '备货时间', + is_picked_up: '是否提货', + picked_up_at: '提货时间', } export function applyOrderListColumnLabels(columns: T[]): T[] { @@ -2257,14 +2274,58 @@ export function buildPendingStyleColumns(baseColumns: ReadonlyArray<{ prop: stri return applyOrderListCopyActions(source) } +/** + * 待处理 B2B 订单专属列(仅「待处理B2B订单」页签使用)。 + * B2B list 返回字段与待处理 list 有差异:除补齐配送订单列表已有的通用字段外, + * 还包含备货 / 提货 / 箱数 / 筐号 / 提货车牌等 B2B 业务字段。 + */ +export function buildPendingB2bColumns() { + const base = buildPendingStyleColumns() + const extras: Array<{ prop: string; label: string; [key: string]: any }> = [ + // 与配送订单列表对齐的通用字段 + { prop: 'pre_delivery_order_code', label: '前置单号', width: '150', showOverflowTooltip: true }, + { prop: 'wave_id', label: '波次ID', width: '90' }, + { prop: 'order_type', label: '订单类型', width: '100', formatter: orderTypeFormatter }, + { prop: 'buyer_nick', label: '买家昵称', width: '120', showOverflowTooltip: true }, + { prop: 'seller_nick', label: '卖家昵称', width: '120', showOverflowTooltip: true }, + { prop: 'city', label: '城市', width: '90' }, + { prop: 'area', label: '区/县', width: '90' }, + { prop: 'status', label: '订单状态', width: '100', formatter: (row: any) => translateOrderField('status', row?.status) }, + { prop: 'outbound_status', label: '数据归档', width: '100', formatter: (row: any) => translateOrderField('outbound_status', row?.outbound_status) }, + { prop: 'inspection_status', label: '审核状态', width: '100', formatter: (row: any) => translateOrderField('inspection_status', row?.inspection_status) }, + { prop: 'invoice_flag', label: '发票', width: '80', formatter: (row: any) => translateOrderField('invoice_flag', row?.invoice_flag) }, + { prop: 'weight_type', label: '重量类型', width: '90', formatter: weightTypeFormatter }, + { prop: 'delivery_type', label: '配送类型', width: '100' }, + { prop: 'basket_number', label: '篮号', width: '90' }, + { prop: 'total_amount', label: '订单金额', width: '110' }, + { prop: 'item_amount', label: '商品金额', width: '110' }, + { prop: 'freight', label: '运费', width: '90' }, + { prop: 'sys_logistics_name', label: '系统快递', width: '120', showOverflowTooltip: true }, + { prop: 'operator_name', label: '操作人', width: '100' }, + { prop: 'delivery_time', label: '配送时间', width: '165', formatter: orderTimeFormatter }, + { prop: 'operate_time', label: '操作时间', width: '165', formatter: orderTimeFormatter }, + // B2B 专属字段 + { prop: 'total_box_count', label: '总箱数', width: '90' }, + { prop: 'pickup_plate_number', label: '提货车牌', width: '120', showOverflowTooltip: true }, + { prop: 'prep_remark', label: '备货备注', minWidth: '180', showOverflowTooltip: true }, + { prop: 'prep_duration_seconds', label: '备货时长(秒)', width: '110' }, + { prop: 'prep_at', label: '备货时间', width: '165', formatter: orderTimeFormatter }, + { prop: 'is_picked_up', label: '是否提货', width: '90', formatter: (row: any) => (String(row?.is_picked_up ?? '').trim().toUpperCase() === 'Y' ? '是' : '否') }, + { prop: 'picked_up_at', label: '提货时间', width: '165', formatter: orderTimeFormatter }, + ] + return applyOrderListCopyActions([...base, ...extras]) +} + /** 订单管理模块 tab 清单(标签排序弹窗用;name 与 index.vue tabs[].name 一致,label 为中文标签) */ export const ORDER_TAB_LIST: { name: string; label: string }[] = [ { name: 'reviewOrder', label: '待审核订单' }, { name: 'pendingOrder', label: '待处理订单' }, + { name: 'pendingOrder2b', label: '待处理B2B订单' }, { name: 'exceptionOrder', label: '待处理异常订单' }, { name: 'outboundOrder', label: '待出库订单' }, { name: 'entrustWarehouse', label: '委托外仓订单' }, { name: 'deliveryOrder', label: '配送订单' }, + { name: 'deliveryOrder2b', label: '配送B2B订单' }, { name: 'deliveryException', label: '配送异常订单' }, { name: 'archiveOrder', label: '归档订单' } ] @@ -2383,6 +2444,7 @@ export const pendingToolbarButtonKeys = [ 'syncOrderIds', 'batchUnintercept', 'confirmIntercept', + 'convertToB2b', 'batchLock', 'batchUnlock', 'batchPrint', diff --git a/src/views/order/orderManagement/deliveryOrder.vue b/src/views/order/orderManagement/deliveryOrder.vue index 4e3b709f..8e3b6968 100644 --- a/src/views/order/orderManagement/deliveryOrder.vue +++ b/src/views/order/orderManagement/deliveryOrder.vue @@ -404,6 +404,9 @@ import { createSimpleListToolbarController } from '@/views/order/shared/toolbarA import { safeInvoke } from '@/utils/safe-invoke' const scanBox = ref(null) const upperTable = ref(null) +const props = defineProps<{ + listRequest?: typeof orderDeliveryOrder.list +}>() const presetTree = ref([]) const availableFieldsRef = reactive(JSON.parse(JSON.stringify(deliveryAvailableFields))) const activeTab = ref('detail') @@ -592,7 +595,7 @@ async function loadData() { sortOrder: 'DESC' as const } } - const res: any = await orderDeliveryOrder.list(params) + const res: any = await (props.listRequest ?? orderDeliveryOrder.list)(params) if (res && (res.code === 200 || res.code === 1)) { const data = parseOrderListResponse(res) list.value = data.list diff --git a/src/views/order/orderManagement/deliveryOrder2b.vue b/src/views/order/orderManagement/deliveryOrder2b.vue new file mode 100644 index 00000000..e235201e --- /dev/null +++ b/src/views/order/orderManagement/deliveryOrder2b.vue @@ -0,0 +1,8 @@ + + + diff --git a/src/views/order/orderManagement/form/ConvertToB2bForm.vue b/src/views/order/orderManagement/form/ConvertToB2bForm.vue new file mode 100644 index 00000000..24b6a60b --- /dev/null +++ b/src/views/order/orderManagement/form/ConvertToB2bForm.vue @@ -0,0 +1,629 @@ + + + + + + + diff --git a/src/views/order/orderManagement/index.vue b/src/views/order/orderManagement/index.vue index 5ccd81f8..1659e260 100644 --- a/src/views/order/orderManagement/index.vue +++ b/src/views/order/orderManagement/index.vue @@ -71,6 +71,8 @@ const ReviewOrder = defineAsyncComponent(() => import('./reviewOrder.vue')) const OutboundOrder = defineAsyncComponent(() => import('./outboundOrder.vue')) const ExceptionOrder = defineAsyncComponent(() => import('./exceptionOrder.vue')) const DeliveryOrder = defineAsyncComponent(() => import('./deliveryOrder.vue')) +const PendingOrder2b = defineAsyncComponent(() => import('./pendingOrder2b.vue')) +const DeliveryOrder2b = defineAsyncComponent(() => import('./deliveryOrder2b.vue')) const EntrustWarehouse = defineAsyncComponent(() => import('./entrustWarehouse.vue')) const DeliveryException = defineAsyncComponent(() => import('./deliveryException.vue')) const ArchiveOrder = defineAsyncComponent(() => import('./archiveOrder.vue')) @@ -119,6 +121,12 @@ const tabs = ref([ count: 10, component: markRaw(PendingOrder) }, + { + name: 'pendingOrder2b', + label: '待处理B2B订单', + count: 0, + component: markRaw(PendingOrder2b) + }, { name: 'exceptionOrder', label: '待处理异常订单', @@ -143,6 +151,12 @@ const tabs = ref([ count: 0, component: markRaw(DeliveryOrder) }, + { + name: 'deliveryOrder2b', + label: '配送B2B订单', + count: 0, + component: markRaw(DeliveryOrder2b) + }, { name: 'deliveryException', label: '配送异常订单', diff --git a/src/views/order/orderManagement/pendingOrder.vue b/src/views/order/orderManagement/pendingOrder.vue index 74f9a6a5..887f3f32 100644 --- a/src/views/order/orderManagement/pendingOrder.vue +++ b/src/views/order/orderManagement/pendingOrder.vue @@ -38,10 +38,10 @@
@@ -399,6 +399,15 @@ @submit="submitAllocateSubOrderNumber" /> + + + import('@/views/order/waveOrder/component/WavePlatformPrintPreviewDialog.vue')) +const ConvertToB2bForm = defineAsyncComponent(() => import('./form/ConvertToB2bForm.vue')) const scanBox = ref(null) const upperTable = ref(null) const route = useRoute() +const props = defineProps<{ + listRequest?: typeof orderPendingOrder.list + /** B2B 页签复用本页:数据已是 B2B 订单,隐藏「转B2B订单」入口 */ + b2b?: boolean +}>() const { splitStackRef, beginSplitDrag, lowerPaneStyle, upperPaneStyle } = useVerticalSplitPane({ defaultLowerPercent: 38, @@ -556,7 +572,8 @@ function handleSortChange({ prop, order }: { prop?: string | null; order?: strin void loadData() } -const columns = ref(buildPendingStyleColumns()) +/** B2B 页签:接口字段更多,补齐与配送订单一致的通用列及 B2B 专属列 */ +const columns = ref(props.b2b ? buildPendingB2bColumns() : buildPendingStyleColumns()) const selectionRows = ref([]) const hasSelection = ref(false) @@ -567,7 +584,9 @@ const selectedOrderIds = computed(() => getSelectedIds()) const selectedOrderId = ref(null) const detailVisible = ref(true) -const toolbarButtons = pendingToolbarButtons +const toolbarButtons = computed(() => + props.b2b ? pendingToolbarButtons.filter((button) => button.key !== 'convertToB2b') : pendingToolbarButtons +) const initialConditions = computed(() => { const waveNo = String(route.query.wave_no || '').trim() if (!waveNo) return undefined @@ -738,7 +757,7 @@ async function loadData() { } try { - const res = await orderPendingOrder.list(queryParams) + const res = await (props.listRequest ?? orderPendingOrder.list)(queryParams) if (res && (res.code === 1 || res.code === 200)) { const data = parseOrderListResponse(res) list.value = data.list @@ -776,8 +795,8 @@ const pageExport = createOrderPageExport({ buildSort: buildSortParams, selectionRows, columns, - fileNamePrefix: '待处理订单', - storageKey: 'orderManagement:pendingOrder:exportTaskId' + fileNamePrefix: props.b2b ? '待处理B2B订单' : '待处理订单', + storageKey: props.b2b ? 'orderManagement:pendingOrder2b:exportTaskId' : 'orderManagement:pendingOrder:exportTaskId' }) const { @@ -856,6 +875,35 @@ function resetResolveExceptionDialog() { resolveExceptionOrderIds.value = [] } +// 批量转 B2B(order.convertToB2b):弹窗内完成提交并展示逐单跳过原因 +const convertToB2bDialogVisible = ref(false) +const convertToB2bRows = ref([]) + +function openConvertToB2bDialog() { + if (!selectionRows.value.length) { + ElMessage.warning('请先勾选需要转 B2B 的订单') + return + } + convertToB2bRows.value = selectionRows.value.slice() + convertToB2bDialogVisible.value = true +} + +function handleConvertToB2bSuccess() { + upperTable.value?.clearSelection?.() + selectionRows.value = [] + hasSelection.value = false + loadData() +} + +/** 转 B2B 弹窗移除某个已选订单:同步快照行并取消列表勾选 */ +function removeConvertToB2bRow(value: string | number) { + const target = String(value) + const index = convertToB2bRows.value.findIndex((row: any) => String(row?.id) === target) + if (index > -1) convertToB2bRows.value.splice(index, 1) + const row = selectionRows.value.find((item: any) => String(item?.id) === target) + if (row) upperTable.value?.toggleRowSelection?.(row, false) +} + async function submitResolveException() { if (resolveExceptionLoading.value) return const ids = [...resolveExceptionOrderIds.value] @@ -1082,6 +1130,7 @@ function removeQuickRecheckOrder(value: string | number) { } toolbarActionMap['openResolveExceptionDialog'] = openResolveExceptionDialog +toolbarActionMap['openConvertToB2bDialog'] = openConvertToB2bDialog toolbarActionMap['handleBatchPrint'] = handleBatchPrint toolbarActionMap['handleSubWaybillPrint'] = handleSubWaybillPrint toolbarActionMap['handleConfirmInterceptBatch'] = handleConfirmInterceptBatch diff --git a/src/views/order/orderManagement/pendingOrder2b.vue b/src/views/order/orderManagement/pendingOrder2b.vue new file mode 100644 index 00000000..17020b03 --- /dev/null +++ b/src/views/order/orderManagement/pendingOrder2b.vue @@ -0,0 +1,8 @@ + + +