This commit is contained in:
liufumingren 2026-11-16 09:55:27 +08:00
parent dcdc3b6fd3
commit b4a458abd3
9 changed files with 873 additions and 11 deletions

View File

@ -234,6 +234,20 @@ export function orderDeliveryOrderList(data: DeliveryOrderListParams = {}): Prom
} as any)
}
export function orderDeliveryOrder2bList(data: DeliveryOrderListParams = {}): Promise<any> {
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<any> {
return request({
url: '/system',
@ -340,3 +354,7 @@ export const orderDeliveryOrder = {
quickSearch: orderDeliveryOrderQuickSearch,
summary: orderDeliveryOrderSummary,
}
export const orderDeliveryOrder2b = {
list: orderDeliveryOrder2bList
}

View File

@ -343,6 +343,71 @@ export function orderPendingOrderList(data: PendingOrderListParams = {}): Promis
} as any);
}
export function orderPendingOrder2bList(data: PendingOrderListParams = {}): Promise<any> {
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<any> {
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<any> {
@ -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,
};

View File

@ -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<string, ToolbarButtonConfig> = {
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<string, string> = {
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<T extends { prop: string; label: string }>(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',

View File

@ -404,6 +404,9 @@ import { createSimpleListToolbarController } from '@/views/order/shared/toolbarA
import { safeInvoke } from '@/utils/safe-invoke'
const scanBox = ref<any>(null)
const upperTable = ref<any>(null)
const props = defineProps<{
listRequest?: typeof orderDeliveryOrder.list
}>()
const presetTree = ref<any[]>([])
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

View File

@ -0,0 +1,8 @@
<script setup lang="ts">
import { orderDeliveryOrder2b } from '@/api/order.deliveryorder/orderdeliveryOrder'
import DeliveryOrder from './deliveryOrder.vue'
</script>
<template>
<DeliveryOrder :list-request="orderDeliveryOrder2b.list" />
</template>

View File

@ -0,0 +1,629 @@
<template>
<el-dialog
:model-value="visible"
class="convert-to-b2b-dialog"
width="min(760px, 94vw)"
align-center
append-to-body
:show-close="false"
:close-on-click-modal="false"
:close-on-press-escape="!submitting"
@update:model-value="handleVisibleChange"
@closed="resetState"
>
<!-- 面板结构对齐「配送订单批量转退回拆包单」 -->
<div class="task-panel">
<header class="task-panel__head">
<div class="task-panel__titles">
<h2>待处理订单批量转 B2B</h2>
<p>将勾选的订单标记为 B2B 订单并写入 B2B 作业明细</p>
</div>
<button
class="task-panel__close"
type="button"
aria-label="关闭"
:disabled="submitting"
@click="handleVisibleChange(false)"
>
<svg viewBox="0 0 12 12" fill="none">
<path d="M1 1L11 11M11 1L1 11" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" />
</svg>
</button>
</header>
<div class="task-panel__body">
<template v-if="!result">
<div class="task-panel__form">
<SelectedTags
label="已勾选"
:items="selectedRowTagItems"
empty-text="暂未勾选订单"
@remove="emit('remove-row', $event)"
/>
<div class="task-panel__field">
<span class="task-panel__field-label">去重后可提交</span>
<strong class="task-panel__field-value">{{ submitIds.length }} 条 / 上限 {{ MAX_COUNT }} 条</strong>
</div>
<div class="task-panel__section">
<span class="task-panel__section-title">订单预览</span>
<div class="task-panel__table-wrap">
<el-table :data="previewRows" size="small" border max-height="240" empty-text="无">
<el-table-column label="订单ID" width="100" align="center">
<template #default="{ row }">{{ row.order_id ?? '-' }}</template>
</el-table-column>
<el-table-column label="发货单号" min-width="180" align="center" show-overflow-tooltip>
<template #default="{ row }">{{ row.delivery_order_code || '-' }}</template>
</el-table-column>
<el-table-column label="能否转换" min-width="220" align="center" show-overflow-tooltip>
<template #default="{ row }">
<span :class="getStatusTextClass(row.tagType)">{{ row.tagText }}</span>
</template>
</el-table-column>
</el-table>
</div>
</div>
<p class="task-panel__form-tip">
仅转换当前仓库待处理分表中的订单;不符合准入条件(待审核 / 已复核 / 已拣货 / 已锁定 / 已拦截 / 已是 B2B)的订单会跳过且不报错,原因在结果中展示;已打印不影响转换。
</p>
<p v-if="!submitIds.length" class="task-panel__form-tip task-panel__form-tip--warning">
所选行均缺少订单ID,无可用订单可提交;请重新勾选列表中的待处理订单。
</p>
<template v-else>
<p v-if="blockedRows.length" class="task-panel__form-tip">
其中 {{ blockedRows.length }} 条缺少订单ID,不会提交
</p>
<p v-if="advisorySkipRows.length" class="task-panel__form-tip">
其中 {{ advisorySkipRows.length }} 条按当前列表状态预计会被跳过,仍会提交并由服务端最终判定
</p>
<p v-if="overLimit" class="task-panel__form-tip task-panel__form-tip--error">
去重后 {{ submitIds.length }} 条已超过单次上限 {{ MAX_COUNT }} 条,请减少勾选后重试
</p>
</template>
</div>
</template>
<template v-else>
<div class="task-panel__form">
<div class="task-panel__field">
<span class="task-panel__field-label">提交订单</span>
<strong class="task-panel__field-value">{{ result.total }} 条</strong>
</div>
<div class="task-panel__field">
<span class="task-panel__field-label">转换成功</span>
<strong class="task-panel__field-value task-panel__field-value--success">
{{ result.converted_count }} 条
</strong>
</div>
<div class="task-panel__field">
<span class="task-panel__field-label">跳过</span>
<strong
class="task-panel__field-value"
:class="{ 'task-panel__field-value--warning': result.skipped_count > 0 }"
>
{{ result.skipped_count }} 条
</strong>
</div>
<div class="task-panel__field">
<span class="task-panel__field-label">当前仓库未找到</span>
<strong
class="task-panel__field-value"
:class="{ 'task-panel__field-value--warning': result.not_found_order_ids.length > 0 }"
>
{{ result.not_found_order_ids.length }} 条
</strong>
</div>
<div v-if="result.converted_order_ids.length" class="task-panel__section">
<div class="task-panel__section-head">
<span class="task-panel__section-title">转换成功订单({{ result.converted_count }})</span>
<el-button link type="primary" size="small" @click="copyConvertedIds">复制成功订单ID</el-button>
</div>
<div class="task-panel__table-wrap">
<el-table :data="convertedRows" size="small" border max-height="160" empty-text="无">
<el-table-column prop="order_id" label="订单ID" align="center" />
</el-table>
</div>
</div>
<div v-if="skippedReasons.length" class="task-panel__section">
<div class="task-panel__section-head">
<span class="task-panel__section-title">跳过明细({{ skippedReasons.length }})</span>
<el-button link type="primary" size="small" @click="copySkippedIds">复制跳过订单ID</el-button>
</div>
<div class="task-panel__table-wrap">
<el-table :data="skippedReasons" size="small" border max-height="200" empty-text="无">
<el-table-column prop="order_id" label="订单ID" width="110" align="center" />
<el-table-column label="发货单号" min-width="170" show-overflow-tooltip>
<template #default="{ row }">{{ row.delivery_order_code || '-' }}</template>
</el-table-column>
<el-table-column prop="reason" label="跳过原因" min-width="220" show-overflow-tooltip />
</el-table>
</div>
</div>
<div v-if="result.not_found_order_ids.length" class="task-panel__section">
<div class="task-panel__section-head">
<span class="task-panel__section-title">当前仓库未找到({{ result.not_found_order_ids.length }})</span>
<el-button link type="primary" size="small" @click="copyNotFoundIds">复制未找到订单ID</el-button>
</div>
<div class="task-panel__table-wrap">
<el-table :data="notFoundRows" size="small" border max-height="160" empty-text="无">
<el-table-column prop="order_id" label="订单ID" align="center" />
</el-table>
</div>
</div>
<div
v-if="!result.converted_order_ids.length && !skippedReasons.length && !result.not_found_order_ids.length"
class="convert-empty"
>
<el-empty description="本次提交没有可处理的订单" :image-size="60" />
</div>
</div>
</template>
</div>
<footer class="task-panel__foot">
<span class="task-panel__hint">
{{ result ? '关闭后可查看列表最新状态' : '提交后由服务端逐单判定' }}
</span>
<div class="task-panel__actions">
<template v-if="!result">
<el-button size="small" :disabled="submitting" @click="handleVisibleChange(false)">取消</el-button>
<el-button size="small" type="primary" :loading="submitting" :disabled="!canSubmit" @click="submit">
确认转 B2B
</el-button>
</template>
<el-button v-else size="small" type="primary" @click="handleVisibleChange(false)">完成</el-button>
</div>
</footer>
</div>
</el-dialog>
</template>
<script setup lang="ts">
import { computed, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
import SelectedTags from '@/components/task-progress/SelectedTags.vue'
import {
orderPendingOrderConvertToB2b,
type PendingOrderConvertToB2bResponse
} from '@/api/order.pendingorder/orderpendingOrder'
import { getStatusTextClass } from '../config/order-common-config'
import {
isActiveInterceptStatus,
resolveOrderInterceptStatus,
resolveOrderRecheckStatus
} from '@/views/order/shared/orderListExport'
/**
* 待处理订单批量转 B2B(order.convertToB2b)
* 由「待处理订单」页使用:入参取勾选行 id(wms_order_delivery*.id)。
*/
const MAX_COUNT = 200
const props = withDefaults(
defineProps<{
visible: boolean
/** 勾选的待处理订单行(取 id 作为入参 ids) */
rows?: any[]
}>(),
{ rows: () => [] }
)
const emit = defineEmits<{
(e: 'update:visible', value: boolean): void
/** 提交完成后触发,供父页面刷新列表 */
(e: 'success'): void
/** 用户移除某个已勾选订单 */
(e: 'remove-row', value: string | number): void
}>()
type ConvertResult = Required<Pick<PendingOrderConvertToB2bResponse, 'converted_order_ids' | 'converted_count' | 'skipped_count' | 'not_found_order_ids'>> & {
total: number
skipped_reasons: PendingOrderConvertToB2bResponse['skipped_reasons']
}
const submitting = ref(false)
const result = ref<ConvertResult | null>(null)
const selectedRowTagItems = computed(() =>
(props.rows || [])
.filter((row) => row?.id !== undefined && row?.id !== null && row?.id !== '')
.map((row) => ({
label: String(row?.delivery_order_code ?? row?.id ?? ''),
value: row.id as number | string
}))
)
// 已勾选订单被逐个移除,最后一个移除后自动关闭(结果态不参与)
watch(
() => (props.rows || []).length,
(length, prevLength) => {
if (!props.visible || submitting.value || result.value) return
if (prevLength > 0 && length === 0) emit('update:visible', false)
}
)
function toOrderId(value: unknown): number | null {
const id = Number(value)
return Number.isInteger(id) && id > 0 ? id : null
}
/** 按列表可见字段预估跳过原因(服务端最终判定;已打印不影响转换) */
function resolveAdvisorySkipReason(row: any): string {
const status = String(row?.status ?? '').trim().toLowerCase()
if (['pedding', 'pending', 'wait_audit'].includes(status)) return '订单待审核'
if (String(resolveOrderRecheckStatus(row)).trim().toLowerCase() === 'fin') return '订单已复核'
if (String(row?.pick_status ?? '').trim().toLowerCase() === 'fin') return '订单已拣货'
const lockStatus = String(row?.lock_status ?? '').trim().toLowerCase()
if (lockStatus && !['n', 'none', '0', 'false', 'no'].includes(lockStatus)) return '订单已锁定'
if (isActiveInterceptStatus(resolveOrderInterceptStatus(row))) return '订单已拦截'
if (String(row?.is_b2b ?? '').trim().toUpperCase() === 'Y') return '订单已是B2B订单'
return ''
}
type PreviewRow = {
order_id: number | null
delivery_order_code: string
tagType: 'success' | 'info' | 'danger'
tagText: string
}
const previewRows = computed<PreviewRow[]>(() => {
const seen = new Set<number>()
const list: PreviewRow[] = []
for (const row of props.rows || []) {
const orderId = toOrderId(row?.id)
if (orderId !== null) {
if (seen.has(orderId)) continue
seen.add(orderId)
}
const advisoryReason = resolveAdvisorySkipReason(row)
let tagType: PreviewRow['tagType'] = 'success'
let tagText = '可转换'
if (orderId === null) {
tagType = 'danger'
tagText = '缺少订单ID'
} else if (advisoryReason) {
tagType = 'info'
tagText = `${advisoryReason}·预计跳过`
}
list.push({
order_id: orderId,
delivery_order_code: String(row?.delivery_order_code ?? row?.order_code ?? ''),
tagType,
tagText
})
}
return list
})
const submitIds = computed<number[]>(() =>
previewRows.value.filter((row) => row.order_id !== null).map((row) => row.order_id as number)
)
const blockedRows = computed(() => previewRows.value.filter((row) => row.order_id === null))
const advisorySkipRows = computed(() => previewRows.value.filter((row) => row.tagType === 'info'))
const overLimit = computed(() => submitIds.value.length > MAX_COUNT)
const canSubmit = computed(() => submitIds.value.length > 0 && !overLimit.value && !submitting.value)
const skippedReasons = computed(() => result.value?.skipped_reasons ?? [])
const convertedRows = computed(() => (result.value?.converted_order_ids ?? []).map((order_id) => ({ order_id })))
const notFoundRows = computed(() => (result.value?.not_found_order_ids ?? []).map((order_id) => ({ order_id })))
function handleVisibleChange(next: boolean) {
emit('update:visible', next)
}
function resetState() {
result.value = null
submitting.value = false
}
async function submit() {
if (!canSubmit.value) return
submitting.value = true
try {
const res: any = await orderPendingOrderConvertToB2b({ ids: submitIds.value })
if (!(res && (res.code === 1 || res.code === 200 || res.flag === 'success'))) {
ElMessage.error(res?.message || '批量转 B2B 失败')
return
}
const payload = (res.data && typeof res.data === 'object' ? res.data : res) as PendingOrderConvertToB2bResponse
const convertedIds = Array.isArray(payload.converted_order_ids) ? payload.converted_order_ids : []
const skippedReasonsList = Array.isArray(payload.skipped_reasons) ? payload.skipped_reasons : []
const notFoundIds = Array.isArray(payload.not_found_order_ids) ? payload.not_found_order_ids : []
result.value = {
total: submitIds.value.length,
converted_order_ids: convertedIds,
converted_count: Number(payload.converted_count ?? convertedIds.length),
skipped_count: Number(payload.skipped_count ?? skippedReasonsList.length),
skipped_reasons: skippedReasonsList,
not_found_order_ids: notFoundIds
}
const parts = [
`转 B2B 完成:成功 ${result.value.converted_count} 条`,
result.value.skipped_count ? `跳过 ${result.value.skipped_count} 条` : '',
notFoundIds.length ? `未找到 ${notFoundIds.length} 条` : ''
].filter(Boolean)
if (result.value.skipped_count || notFoundIds.length) {
ElMessage.warning(parts.join(','))
} else {
ElMessage.success(parts.join(','))
}
emit('success')
} catch {
// 请求层已统一提示错误
} finally {
submitting.value = false
}
}
async function copyText(text: string, label: string, count: number) {
if (!count) {
ElMessage.warning(`没有可复制的${label}`)
return
}
try {
if (!navigator.clipboard?.writeText) throw new Error('no clipboard api')
await navigator.clipboard.writeText(text)
ElMessage.success(`已复制 ${count} 个${label}`)
} catch {
try {
const textarea = document.createElement('textarea')
textarea.value = text
textarea.setAttribute('readonly', 'readonly')
textarea.style.position = 'fixed'
textarea.style.left = '-9999px'
document.body.appendChild(textarea)
textarea.select()
document.execCommand('copy')
document.body.removeChild(textarea)
ElMessage.success(`已复制 ${count} 个${label}`)
} catch {
ElMessage.error('复制失败,请手动复制')
}
}
}
function buildIdText(ids: number[]) {
return ids.filter((id) => Number.isInteger(id) && id > 0).join('\n')
}
function copyConvertedIds() {
const ids = result.value?.converted_order_ids ?? []
return copyText(buildIdText(ids), '成功订单ID', ids.length)
}
function copySkippedIds() {
const ids = (skippedReasons.value || []).map((item) => Number(item?.order_id)).filter((id) => Number.isInteger(id) && id > 0)
return copyText(buildIdText(ids), '跳过订单ID', ids.length)
}
function copyNotFoundIds() {
const ids = result.value?.not_found_order_ids ?? []
return copyText(buildIdText(ids), '未找到订单ID', ids.length)
}
</script>
<style scoped lang="scss">
/* 状态文字颜色:与待处理订单「同步状态」同一套轻量样式 */
.ut-status-text {
font-size: 12px;
line-height: 18px;
white-space: nowrap;
}
.ut-status-text--primary { color: var(--el-color-primary); }
.ut-status-text--success { color: var(--el-color-success); }
.ut-status-text--warning { color: var(--el-color-warning); }
.ut-status-text--info { color: var(--el-color-info); }
.ut-status-text--danger { color: var(--el-color-danger); }
/* 面板结构 / 尺寸对齐 TaskProgressPanel(手工录入运单号) */
.task-panel {
display: flex;
flex-direction: column;
max-height: calc(100vh - 96px);
background: #fff;
color: #303133;
&__head {
display: flex;
align-items: flex-start;
gap: 12px;
padding: 16px;
flex-shrink: 0;
}
&__titles {
flex: 1;
min-width: 0;
h2 {
margin: 0;
font-size: 18px;
line-height: 24px;
font-weight: 400;
color: #303133;
}
p {
margin: 4px 0 0;
font-size: 12px;
line-height: 18px;
color: #909399;
}
}
&__close {
width: 24px;
height: 24px;
flex: none;
display: inline-flex;
align-items: center;
justify-content: center;
border: none;
border-radius: 4px;
background: transparent;
color: #909399;
cursor: pointer;
transition: color 0.2s;
svg {
width: 12px;
height: 12px;
}
&:not(:disabled):hover {
color: #409eff;
}
&:disabled {
cursor: not-allowed;
opacity: 0.5;
}
}
&__body {
padding: 12px 16px 0;
min-height: 0;
overflow-y: auto;
}
&__form {
display: flex;
flex-direction: column;
gap: 8px;
}
&__field {
display: flex;
align-items: center;
justify-content: space-between;
gap: 16px;
min-height: 40px;
padding: 8px 12px;
border: 1px solid #ebeef5;
border-radius: 4px;
background: #fafafa;
}
&__field-label {
font-size: 12px;
line-height: 20px;
color: #606266;
flex-shrink: 0;
white-space: nowrap;
}
&__field-value {
font-size: 13px;
font-weight: 500;
color: #303133;
text-align: right;
&--success {
color: #67c23a;
}
&--warning {
color: #e6a23c;
}
&--danger {
color: #f56c6c;
}
}
&__section {
display: flex;
flex-direction: column;
gap: 6px;
}
&__section-head {
display: flex;
align-items: center;
justify-content: space-between;
gap: 8px;
}
&__section-title {
font-size: 12px;
line-height: 20px;
color: #606266;
padding-left: 2px;
}
&__table-wrap {
border-radius: 4px;
overflow: hidden;
}
&__form-tip {
margin: 8px 0 0;
padding: 8px 12px;
border-radius: 4px;
background: #f4f4f5;
font-size: 12px;
line-height: 18px;
color: #909399;
&--warning {
background: #fdf6ec;
color: #e6a23c;
}
&--error {
background: #fef0f0;
color: #f56c6c;
}
}
&__foot {
display: flex;
align-items: center;
justify-content: space-between;
gap: 12px;
padding: 12px 16px 16px;
flex-shrink: 0;
}
&__hint {
font-size: 12px;
color: #909399;
}
&__actions {
display: flex;
align-items: center;
gap: 6px;
:deep(.el-button) {
margin-left: 0;
margin-right: 0;
}
}
}
.convert-empty {
padding: 12px 0;
}
</style>
<style lang="scss">
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
.el-dialog.convert-to-b2b-dialog {
padding: 0;
overflow: hidden;
.el-dialog__header {
display: none;
}
.el-dialog__body {
padding: 0;
}
}
</style>

View File

@ -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<OrderTabItem[]>([
count: 10,
component: markRaw(PendingOrder)
},
{
name: 'pendingOrder2b',
label: '待处理B2B订单',
count: 0,
component: markRaw(PendingOrder2b)
},
{
name: 'exceptionOrder',
label: '待处理异常订单',
@ -143,6 +151,12 @@ const tabs = ref<OrderTabItem[]>([
count: 0,
component: markRaw(DeliveryOrder)
},
{
name: 'deliveryOrder2b',
label: '配送B2B订单',
count: 0,
component: markRaw(DeliveryOrder2b)
},
{
name: 'deliveryException',
label: '配送异常订单',

View File

@ -38,10 +38,10 @@
<div class="upper-wrapper" :style="detailVisible ? upperPaneStyle : upperPaneFullStyle">
<upper-table
ref="upperTable"
title="待处理订单列表"
:title="b2b ? '待处理B2B订单列表' : '待处理订单列表'"
default-align="center"
:enable-column-config="true"
table-id="order-management-pending-order"
:table-id="b2b ? 'order-management-pending-order-2b' : 'order-management-pending-order'"
:data="list"
:columns="columns"
:table-size="tableSize"
@ -131,7 +131,7 @@
</template>
<template #empty>
<div class="empty-tip">暂无待处理订单</div>
<div class="empty-tip">{{ b2b ? '暂无待处理B2B订单' : '暂无待处理订单' }}</div>
</template>
</upper-table>
</div>
@ -399,6 +399,15 @@
@submit="submitAllocateSubOrderNumber"
/>
<!-- 待处理订单批量转 B2B(order.convertToB2b):入参取勾选行 id -->
<convert-to-b2b-form
v-if="convertToB2bDialogVisible"
v-model:visible="convertToB2bDialogVisible"
:rows="convertToB2bRows"
@remove-row="removeConvertToB2bRow"
@success="handleConvertToB2bSuccess"
/>
<wave-platform-print-preview-dialog
v-if="batchPrintDialogVisible"
v-model="batchPrintDialogVisible"
@ -458,6 +467,7 @@ import { loadExpressListCached, loadPlatformListCached, loadStoresCached } from
import {
buildPendingStyleColumns,
buildPendingB2bColumns,
pendingAvailableFields,
pendingToolbarButtons,
type ToolbarButtonConfig,
@ -503,10 +513,16 @@ import { buildOrderTagItems } from '@/views/order/shared/orderTagItems'
import SelectedTags from '@/components/task-progress/SelectedTags.vue'
import { safeInvoke } from '@/utils/safe-invoke'
const WavePlatformPrintPreviewDialog = defineAsyncComponent(() => import('@/views/order/waveOrder/component/WavePlatformPrintPreviewDialog.vue'))
const ConvertToB2bForm = defineAsyncComponent(() => import('./form/ConvertToB2bForm.vue'))
const scanBox = ref<any>(null)
const upperTable = ref<any>(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<any[]>([])
const hasSelection = ref(false)
@ -567,7 +584,9 @@ const selectedOrderIds = computed(() => getSelectedIds())
const selectedOrderId = ref<number | string | null>(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<any[]>([])
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

View File

@ -0,0 +1,8 @@
<script setup lang="ts">
import { orderPendingOrder2b } from '@/api/order.pendingorder/orderpendingOrder'
import PendingOrder from './pendingOrder.vue'
</script>
<template>
<PendingOrder :list-request="orderPendingOrder2b.list" b2b />
</template>