feat(order): 新增待处理 B2B 订单批量取消,完善收货/盘点筛选与错误提示

- 新增 order.cancelB2b 接口与 CancelB2bForm 弹窗(convertToB2b 的反向操作),
  待处理订单工具栏接入:展示已选标签、去重后可提交数量与上限,支持逐个移除,
  提交后展示成功/跳过原因/未找到订单明细,并提示不支持取消的情形
- 待处理、归档等列表接口文档补充「默认排除 B2B 订单」,如需查询 B2B
  改用 order.pendingOrder2b.list / order.deliveryOrder2b.list
- 收货列表新增「隐藏无可用量」(filterDepleted)与「按入库单筛选」
  (entry_order_id 弹窗选择),移除已废弃的 getAvailableInboundQuantity 接口
- 收货库存明细面板改用 entry / inventory 接口,展示入库单号、库区、库位、
  数量、批次、生产/过期日期与库存类型;详情表单按来货方式动态隐藏物流单号
- 盘点明细新增「删除明细」(仅未开始作业的明细行可删),导出明细支持选择
  「按库位明细」或「明细汇总」模式(商品类任务生效)
- 新增 truncateLongMessage 截断工具,响应拦截与移库失败提示对超长 message
  只保留前 3 段并提示总数,完整信息仍输出到控制台
This commit is contained in:
yin 2026-11-16 18:05:41 +08:00
parent b4a458abd3
commit 4008a28796
23 changed files with 1472 additions and 103 deletions

View File

@ -24,6 +24,8 @@ export type ArchiveOrderListParams = {
* {"create_channel":"MANUAL"} 单值精确;{"create_channel":["QM","API"]} 裸数组按 in 多选;
* {"create_channel":{"operator":"in","value":["QM","API"]}} 标准结构多选;{"create_channel":{"operator":"ne","value":"MANUAL"}} 排除指定渠道。
* 注意:列表响应中的 create_channel 已格式化为中文标签,查询条件须传英文枚举值。
* 默认排除 B2B 订单(is_b2b='Y',NULL 存量行视为非 B2B)——服务端固定条件,前端无法通过 where 覆盖;
* 需要查询 B2B 订单请使用 order.pendingOrder2b.list / order.deliveryOrder2b.list。
*/
where?: OrderWhere
sort?: OrderSort

View File

@ -24,6 +24,8 @@ export type DeliveryExpectionOrderListParams = {
* {"create_channel":"MANUAL"} 单值精确;{"create_channel":["QM","API"]} 裸数组按 in 多选;
* {"create_channel":{"operator":"in","value":["QM","API"]}} 标准结构多选;{"create_channel":{"operator":"ne","value":"MANUAL"}} 排除指定渠道。
* 注意:列表响应中的 create_channel 已格式化为中文标签,查询条件须传英文枚举值。
* 默认排除 B2B 订单(is_b2b='Y',NULL 存量行视为非 B2B)——服务端固定条件,前端无法通过 where 覆盖;
* 需要查询 B2B 订单请使用 order.pendingOrder2b.list / order.deliveryOrder2b.list。
*/
where?: OrderWhere
sort?: OrderSort

View File

@ -24,6 +24,8 @@ export type DeliveryOrderListParams = {
* {"create_channel":"MANUAL"} 单值精确;{"create_channel":["QM","API"]} 裸数组按 in 多选;
* {"create_channel":{"operator":"in","value":["QM","API"]}} 标准结构多选;{"create_channel":{"operator":"ne","value":"MANUAL"}} 排除指定渠道。
* 注意:列表响应中的 create_channel 已格式化为中文标签,查询条件须传英文枚举值。
* 默认排除 B2B 订单(is_b2b='Y',NULL 存量行视为非 B2B)——服务端固定条件,前端无法通过 where 覆盖;
* 需要查询 B2B 订单请使用 order.pendingOrder2b.list / order.deliveryOrder2b.list。
*/
where?: OrderWhere
sort?: OrderSort

View File

@ -24,6 +24,8 @@ export type EntrustOrderListParams = {
* {"create_channel":"MANUAL"} 单值精确;{"create_channel":["QM","API"]} 裸数组按 in 多选;
* {"create_channel":{"operator":"in","value":["QM","API"]}} 标准结构多选;{"create_channel":{"operator":"ne","value":"MANUAL"}} 排除指定渠道。
* 注意:列表响应中的 create_channel 已格式化为中文标签,查询条件须传英文枚举值。
* 默认排除 B2B 订单(is_b2b='Y',NULL 存量行视为非 B2B)——服务端固定条件,前端无法通过 where 覆盖;
* 需要查询 B2B 订单请使用 order.pendingOrder2b.list / order.deliveryOrder2b.list。
*/
where?: OrderWhere
sort?: OrderSort

View File

@ -24,6 +24,8 @@ export type ExpectionOrderListParams = {
* {"create_channel":"MANUAL"} 单值精确;{"create_channel":["QM","API"]} 裸数组按 in 多选;
* {"create_channel":{"operator":"in","value":["QM","API"]}} 标准结构多选;{"create_channel":{"operator":"ne","value":"MANUAL"}} 排除指定渠道。
* 注意:列表响应中的 create_channel 已格式化为中文标签,查询条件须传英文枚举值。
* 默认排除 B2B 订单(is_b2b='Y',NULL 存量行视为非 B2B)——服务端固定条件,前端无法通过 where 覆盖;
* 需要查询 B2B 订单请使用 order.pendingOrder2b.list / order.deliveryOrder2b.list。
*/
where?: OrderWhere
sort?: OrderSort

View File

@ -26,7 +26,9 @@ export type OrderListParams = {
* {"is_sn_order":"Y"} 仅含 SN 商品订单;{"is_sn_order":"N"} 仅无 SN 商品订单。
* 响应行同时返回 has_sn_item(原始列)与 is_sn_order(归一化),前端筛选/展示统一用 is_sn_order。
* - sn_code / snCode / sn_codes / snCodes 按 SN 码反查订单(先查 wms_order_item_sn 拿 order_id 再回填,订单表结构不变):
* 值支持单个字符串、逗号/空格/分号分隔多个码、字符串数组或 { value } 结构,按完整 SN 码精确匹配。 */
* 值支持单个字符串、逗号/空格/分号分隔多个码、字符串数组或 { value } 结构,按完整 SN 码精确匹配。
* - 默认排除 B2B 订单(is_b2b='Y',NULL 存量行视为非 B2B)——服务端固定条件,前端无法通过 where 覆盖;
* 需要查询 B2B 订单请使用 order.pendingOrder2b.list / order.deliveryOrder2b.list。 */
where?: Record<string, any>
sort?: {
sortField?: string

View File

@ -24,6 +24,8 @@ export type OutboundOrderListParams = {
* {"create_channel":"MANUAL"} 单值精确;{"create_channel":["QM","API"]} 裸数组按 in 多选;
* {"create_channel":{"operator":"in","value":["QM","API"]}} 标准结构多选;{"create_channel":{"operator":"ne","value":"MANUAL"}} 排除指定渠道。
* 注意:列表响应中的 create_channel 已格式化为中文标签,查询条件须传英文枚举值。
* 默认排除 B2B 订单(is_b2b='Y',NULL 存量行视为非 B2B)——服务端固定条件,前端无法通过 where 覆盖;
* 需要查询 B2B 订单请使用 order.pendingOrder2b.list / order.deliveryOrder2b.list。
*/
where?: OrderWhere
sort?: OrderSort

View File

@ -53,6 +53,8 @@ export type PendingOrderListParams = {
* 例 {"claim_status":{"operator":"ne","value":"fin"}} 查未完成领料的订单。
* is_sn_order 是否含 SN(序列号)商品筛选(按 has_sn_item 归一化):{"is_sn_order":"Y"} 仅 SN 订单、"N" 仅非 SN 订单。
* sn_code / snCode / sn_codes / snCodes 按 SN 码反查订单(先查 wms_order_item_sn 回填,支持单值/分隔字符串/数组,完整码精确匹配)。
* 默认排除 B2B 订单(is_b2b='Y',NULL 存量行视为非 B2B)——服务端固定条件,前端无法通过 where 覆盖;
* 需要查询 B2B 订单请使用 order.pendingOrder2b.list / order.deliveryOrder2b.list。
*/
where?: OrderWhere;
sort?: OrderSort;
@ -408,6 +410,54 @@ export function orderPendingOrderConvertToB2b(
} as any);
}
/**
* order.cancelB2b:取消 B2B,把 B2B 订单流转回正常订单(order.convertToB2b 的反向操作)
* - 仅查当前仓库 current 分表(wms_order_delivery_{warehouseId}),仓库取自登录上下文,禁止前端传入
* - 准入:is_b2b=Y、step != 0(非待审核)、未锁定、未拦截;打印状态不限制(已打印同样可取消)
* - 事务内 is_b2b 置回 'N',并按 warehouse_id + order_id 物理删除 wms_order_b2b 作业明细(不保留历史)
* - 入参同 convertToB2b:ids / order_ids / orderIds / id / order_id / orderId 均可,单次上限 200;
* 不符合条件的订单只跳过、不报错,原因见 skipped_reasons
* - ⚠️ 文档归属模块为 order.index(folder order.index),此处与 convertToB2b 成对维护
*/
export type PendingOrderCancelB2bParams = PendingOrderConvertToB2bParams;
/** order.cancelB2b 跳过原因项 */
export type PendingOrderCancelB2bSkippedReason = {
order_id: number;
delivery_order_code?: string;
/** 订单待审核,不允许取消B2B / 订单不是B2B订单 / 订单已锁定,不允许取消B2B / 订单已拦截,不允许取消B2B */
reason: string;
};
/** order.cancelB2b 响应 */
export type PendingOrderCancelB2bResponse = {
/** 取消成功的订单 ID(已去重) */
canceled_order_ids: number[];
canceled_count: number;
/** 命中但不满足取消条件被跳过的订单 ID */
skipped_order_ids: number[];
skipped_count: number;
skipped_reasons: PendingOrderCancelB2bSkippedReason[];
/** 当前仓库 current 分表中查不到的订单 ID(已进配送/历史/外仓表,或不属于本仓) */
not_found_order_ids: number[];
};
export function orderPendingOrderCancelB2b(
data: PendingOrderCancelB2bParams,
): Promise<any> {
return request({
url: "/system",
method: "post",
params: {
method: "order.cancelB2b",
v,
timestamp: Date.now(),
},
data,
isSystemApi: true,
} as any);
}
export function orderPendingOrderReverseReviewOrder(
data: PendingOrderReverseReviewParams,
): Promise<any> {
@ -886,6 +936,7 @@ export function orderPendingOrderUpdateRemark(
export type OrderPendingOrderApi = {
list: typeof orderPendingOrderList;
convertToB2b: typeof orderPendingOrderConvertToB2b;
cancelB2b: typeof orderPendingOrderCancelB2b;
detail: typeof orderPendingOrderDetail;
reverseReviewOrder: typeof orderPendingOrderReverseReviewOrder;
markPendingOutboundOrder: typeof orderPendingOrderMarkPendingOutboundOrder;
@ -923,6 +974,7 @@ export type OrderPendingOrderApi = {
export const orderPendingOrder: OrderPendingOrderApi = {
list: orderPendingOrderList,
convertToB2b: orderPendingOrderConvertToB2b,
cancelB2b: orderPendingOrderCancelB2b,
detail: orderPendingOrderDetail,
reverseReviewOrder: orderPendingOrderReverseReviewOrder,
markPendingOutboundOrder: orderPendingOrderMarkPendingOutboundOrder,

View File

@ -26,6 +26,8 @@ export type ReviewOrderListParams = {
* 注意:列表响应中的 create_channel 已格式化为中文标签,查询条件须传英文枚举值。
* is_sn_order 是否含 SN(序列号)商品筛选(按 has_sn_item 归一化):{"is_sn_order":"Y"} 仅 SN 订单、"N" 仅非 SN 订单。
* sn_code / snCode / sn_codes / snCodes 按 SN 码反查订单(先查 wms_order_item_sn 回填,支持单值/分隔字符串/数组,完整码精确匹配)。
* 默认排除 B2B 订单(is_b2b='Y',NULL 存量行视为非 B2B)——服务端固定条件,前端无法通过 where 覆盖;
* 需要查询 B2B 订单请使用 order.pendingOrder2b.list / order.deliveryOrder2b.list。
*/
where?: OrderWhere
sort?: OrderSort

View File

@ -554,6 +554,8 @@ export type WaveStrategyFallbackOrderListParams = {
* 筛选白名单字段。
* 仅支持上述 where 类型中声明的字段,禁止传入 warehouse_id / warehouseId。
* 若传入未列出的字段或禁止字段,接口返回 400。
* 默认排除 B2B 订单(is_b2b='Y',NULL 存量行视为非 B2B)——服务端固定条件,前端无法通过 where 覆盖;
* 需要查询 B2B 订单请使用 order.pendingOrder2b.list / order.deliveryOrder2b.list。
*/
where?: WaveStrategyFallbackOrderListWhere
}

View File

@ -2,56 +2,6 @@ import request from '@/utils/request'
const v = '1.0'
export type GetAvailableInboundQuantityParams = {
stock_id: number
}
export type AvailableInboundQuantityItem = {
detail_id?: number
receiving_id?: number
receiving_number?: string
product_name?: string
actual_quantity?: number
stored_quantity?: number
pending_allocated_quantity?: number
available_quantity?: number
storage_status?: string
batch_number?: string
production_date?: string
expiry_date?: string
space_id?: number
receiving_status?: string
[key: string]: unknown
}
export type GetAvailableInboundQuantityResponse = {
code?: number
message?: string
list?: AvailableInboundQuantityItem[]
total?: number
data?: {
list?: AvailableInboundQuantityItem[]
total?: number
}
}
/** 按 stock_id 查询可入库数量 */
export function getAvailableInboundQuantity(
data: GetAvailableInboundQuantityParams
): Promise<GetAvailableInboundQuantityResponse> {
return request({
url: '/system',
method: 'post',
params: {
method: 'storage.receiving.getAvailableInboundQuantity',
v,
timestamp: new Date().getTime()
},
data,
isSystemApi: true
} as any)
}
/** storage.receiving.export 查询参数(货主维度收货单导出) */
export type ReceivingExportParams = {
where?: Record<string, any>

View File

@ -5,6 +5,7 @@ import {
} from '@/utils/auth'
import router from '@/router'
import { useUserStore } from '@/stores/modules/user'
import { truncateLongMessage } from '@/utils/truncateMessage'
/** 全局默认超时时间(毫秒) */
const DEFAULT_TIMEOUT_MS = 10000
@ -204,7 +205,9 @@ service.interceptors.response.use(
return Promise.reject(createBusinessError(errorMessage, !silentError))
}
if (!silentError) ElMessage.error(errorMessage)
// 展示时截断超长文案(如静态盘点锁定会把上百个盘点单号拼进 message);
// 抛出的 Error 仍保留完整 message,便于 console 排查
if (!silentError) ElMessage.error(truncateLongMessage(errorMessage))
return Promise.reject(createBusinessError(errorMessage, !silentError))
} else {
// 请求成功,返回数据

View File

@ -0,0 +1,46 @@
/**
* 后端报错文案截断
*
* 适用场景:后端把「枚举清单」直接拼进 message,例如静态盘点锁定:
* 商品正在静态盘点中,禁止移库:011000001536(101380) 盘点单 PD...001/PD...002/…/PD...127
* 这类文案可能上百条,直接 ElMessage 会弹一屏、且把按钮挤掉。
*
* 规则:
* 1. 斜杠枚举列表超过 maxItems 项时,只保留前 maxItems 项 + 「等 N 项 / 等 N 张盘点单」
* 2. 仍然超长时按 maxLength 硬截断并补省略号
* 3. 非字符串 / 空值原样兜底(返回 fallback 或空串)
*/
export type TruncateMessageOptions = {
/** 枚举列表最多保留几项,默认 3 */
maxItems?: number
/** 最终文案最大字符数,默认 120 */
maxLength?: number
/** 分隔符,默认 '/' */
separator?: string
}
export function truncateLongMessage(
message: unknown,
options: TruncateMessageOptions = {}
): string {
const { maxItems = 3, maxLength = 120, separator = '/' } = options
const text = message === null || message === undefined ? '' : String(message).trim()
if (!text) return ''
let output = text
const segments = text.split(separator)
if (segments.length > maxItems + 1) {
const kept = segments.slice(0, maxItems).join(separator)
const total = segments.length
// 盘点单号清单这类文案给出更明确的单位
const unit = text.includes('盘点单') ? '张盘点单' : '项'
output = `${kept} 等 ${total} ${unit}`
}
if (output.length > maxLength) {
output = `${output.slice(0, maxLength)}…`
}
return output
}

View File

@ -565,6 +565,15 @@ export const ORDER_TOOLBAR_BUTTONS: Record<string, ToolbarButtonConfig> = {
disabledKey: 'hasNoSelection',
action: 'openConvertToB2bDialog'
},
/** 待处理B2B订单批量取消 B2B(order.cancelB2b):convertToB2b 的反向操作,同样展示逐单跳过原因 */
cancelB2b: {
key: 'cancelB2b',
label: '取消B2B',
size: 'small',
category: 'cancel',
disabledKey: 'hasNoSelection',
action: 'openCancelB2bDialog'
},
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' },
@ -2445,6 +2454,7 @@ export const pendingToolbarButtonKeys = [
'batchUnintercept',
'confirmIntercept',
'convertToB2b',
'cancelB2b',
'batchLock',
'batchUnlock',
'batchPrint',

View File

@ -0,0 +1,638 @@
<template>
<el-dialog
:model-value="visible"
class="cancel-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"
>
<!-- 面板结构对齐「待处理订单批量转 B2B」 -->
<div class="task-panel">
<header class="task-panel__head">
<div class="task-panel__titles">
<h2>待处理B2B订单批量取消 B2B</h2>
<p>把勾选的订单流转回正常订单,并按订单物理删除 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 订单;不满足准入条件(待审核 / 非 B2B 订单 / 已锁定 / 已拦截)的订单会跳过且不报错,原因在结果中展示;已打印不影响取消。取消后该订单的 B2B 作业明细(箱数 / 备货 / 提货信息)将被删除且不可恢复。
</p>
<p v-if="!submitIds.length" class="task-panel__form-tip task-panel__form-tip--warning">
所选行均缺少订单ID,无可用订单可提交;请重新勾选列表中的 B2B 订单。
</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.canceled_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.canceled_order_ids.length" class="task-panel__section">
<div class="task-panel__section-head">
<span class="task-panel__section-title">取消成功订单({{ result.canceled_count }})</span>
<el-button link type="primary" size="small" @click="copyCanceledIds">复制成功订单ID</el-button>
</div>
<div class="task-panel__table-wrap">
<el-table :data="canceledRows" 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.canceled_order_ids.length && !skippedReasons.length && !result.not_found_order_ids.length"
class="cancel-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="danger" :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 {
orderPendingOrderCancelB2b,
type PendingOrderCancelB2bResponse
} from '@/api/order.pendingorder/orderpendingOrder'
import { getStatusTextClass } from '../config/order-common-config'
import {
isActiveInterceptStatus,
resolveOrderInterceptStatus
} from '@/views/order/shared/orderListExport'
/**
* 待处理B2B订单批量取消 B2B(order.cancelB2b)
* 由「待处理B2B订单」页使用:入参取勾选行 id(wms_order_delivery*.id),
* 是 order.convertToB2b 的反向操作。
*/
const MAX_COUNT = 200
const props = withDefaults(
defineProps<{
visible: boolean
/** 勾选的 B2B 订单行(取 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 CancelResult = Required<
Pick<
PendingOrderCancelB2bResponse,
'canceled_order_ids' | 'canceled_count' | 'skipped_count' | 'not_found_order_ids'
>
> & {
total: number
skipped_reasons: PendingOrderCancelB2bResponse['skipped_reasons']
}
const submitting = ref(false)
const result = ref<CancelResult | 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
}
/**
* 按列表可见字段预估跳过原因(服务端最终判定)
* 准入:is_b2b=Y、step != 0(非待审核)、未锁定、未拦截;打印状态不限制
*/
function resolveAdvisorySkipReason(row: any): string {
const step = Number(row?.step)
if (Number.isFinite(step) && step === 0) return '订单待审核'
const isB2b = String(row?.is_b2b ?? '').trim().toUpperCase()
if (isB2b && isB2b !== 'Y') return '订单不是B2B订单'
const lockStatus = String(row?.lock_status ?? '').trim().toLowerCase()
if (lockStatus && !['n', 'none', '0', 'false', 'no'].includes(lockStatus)) return '订单已锁定'
if (isActiveInterceptStatus(resolveOrderInterceptStatus(row))) return '订单已拦截'
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 canceledRows = computed(() => (result.value?.canceled_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 orderPendingOrderCancelB2b({ 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 PendingOrderCancelB2bResponse
const canceledIds = Array.isArray(payload.canceled_order_ids) ? payload.canceled_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,
canceled_order_ids: canceledIds,
canceled_count: Number(payload.canceled_count ?? canceledIds.length),
skipped_count: Number(payload.skipped_count ?? skippedReasonsList.length),
skipped_reasons: skippedReasonsList,
not_found_order_ids: notFoundIds
}
const parts = [
`取消 B2B 完成:成功 ${result.value.canceled_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 copyCanceledIds() {
const ids = result.value?.canceled_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;
}
}
}
.cancel-empty {
padding: 12px 0;
}
</style>
<style lang="scss">
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
.el-dialog.cancel-b2b-dialog {
padding: 0;
overflow: hidden;
.el-dialog__header {
display: none;
}
.el-dialog__body {
padding: 0;
}
}
</style>

View File

@ -408,6 +408,15 @@
@success="handleConvertToB2bSuccess"
/>
<!-- 待处理B2B订单批量取消 B2B(order.cancelB2b):convertToB2b 的反向操作 -->
<cancel-b2b-form
v-if="cancelB2bDialogVisible"
v-model:visible="cancelB2bDialogVisible"
:rows="cancelB2bRows"
@remove-row="removeCancelB2bRow"
@success="handleCancelB2bSuccess"
/>
<wave-platform-print-preview-dialog
v-if="batchPrintDialogVisible"
v-model="batchPrintDialogVisible"
@ -514,6 +523,7 @@ 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 CancelB2bForm = defineAsyncComponent(() => import('./form/CancelB2bForm.vue'))
const scanBox = ref<any>(null)
const upperTable = ref<any>(null)
@ -584,9 +594,11 @@ const selectedOrderIds = computed(() => getSelectedIds())
const selectedOrderId = ref<number | string | null>(null)
const detailVisible = ref(true)
const toolbarButtons = computed(() =>
props.b2b ? pendingToolbarButtons.filter((button) => button.key !== 'convertToB2b') : pendingToolbarButtons
)
const toolbarButtons = computed(() => {
// 两个 B2B 方向互斥:待处理页只能「转B2B」,B2B 页只能「取消B2B」
const hiddenKey = props.b2b ? 'convertToB2b' : 'cancelB2b'
return pendingToolbarButtons.filter((button) => button.key !== hiddenKey)
})
const initialConditions = computed(() => {
const waveNo = String(route.query.wave_no || '').trim()
if (!waveNo) return undefined
@ -904,6 +916,35 @@ function removeConvertToB2bRow(value: string | number) {
if (row) upperTable.value?.toggleRowSelection?.(row, false)
}
// 批量取消 B2B(order.cancelB2b):仅「待处理B2B订单」页签可用
const cancelB2bDialogVisible = ref(false)
const cancelB2bRows = ref<any[]>([])
function openCancelB2bDialog() {
if (!selectionRows.value.length) {
ElMessage.warning('请先勾选需要取消 B2B 的订单')
return
}
cancelB2bRows.value = selectionRows.value.slice()
cancelB2bDialogVisible.value = true
}
function handleCancelB2bSuccess() {
upperTable.value?.clearSelection?.()
selectionRows.value = []
hasSelection.value = false
loadData()
}
/** 取消 B2B 弹窗移除某个已选订单:同步快照行并取消列表勾选 */
function removeCancelB2bRow(value: string | number) {
const target = String(value)
const index = cancelB2bRows.value.findIndex((row: any) => String(row?.id) === target)
if (index > -1) cancelB2bRows.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]
@ -1131,6 +1172,7 @@ function removeQuickRecheckOrder(value: string | number) {
toolbarActionMap['openResolveExceptionDialog'] = openResolveExceptionDialog
toolbarActionMap['openConvertToB2bDialog'] = openConvertToB2bDialog
toolbarActionMap['openCancelB2bDialog'] = openCancelB2bDialog
toolbarActionMap['handleBatchPrint'] = handleBatchPrint
toolbarActionMap['handleSubWaybillPrint'] = handleSubWaybillPrint
toolbarActionMap['handleConfirmInterceptBatch'] = handleConfirmInterceptBatch

View File

@ -363,6 +363,7 @@ import * as warehouseApi from '@/api/warehouse/warehouse'
import * as indexApi from '@/api/index/index'
import { ElMessage } from 'element-plus'
import UpperTable from '@/components/UpperTable/index.vue'
import { truncateLongMessage } from '@/utils/truncateMessage'
import { formatInventorySpaceLabel } from '../inventory-config'
type TransferMode = 'location' | 'product'
@ -801,8 +802,10 @@ async function confirmTransfer() {
// ignore
}
} catch (e: any) {
// 完整报错留在控制台(静态盘点锁定会把上百个盘点单号拼进 message)
console.error('移库失败', e)
ElMessage.error(e?.message || '移库失败')
// 拦截器已弹过提示(notified=true)则不重复弹,避免长文案弹两次
if (!e?.notified) ElMessage.error(truncateLongMessage(e?.message) || '移库失败')
} finally {
transferLoading.value = false
}

View File

@ -4,7 +4,7 @@
<!-- 左:收货明细(表单本身独立滚动,不带动右侧图片) -->
<div class="details-pane details-pane--form">
<div class="task-panel__form">
<template v-for="field in detailpanel" :key="field.prop">
<template v-for="field in formFields" :key="field.prop">
<!-- 只读字段(收货单号 / 创建人):静态信息行 -->
<div v-if="field.prop !== 'store_name' && field.disabled" class="task-panel__field">
<span class="task-panel__field-label">{{ field.label }}</span>
@ -186,6 +186,17 @@ const form = ref({
video_device_id: ''
})
/**
* 表单字段(按来货方式动态过滤):
* 物流单号仅快递/空运/海运可填,与 save 接口「truck/other 会清空」的规则保持一致
*/
const formFields = computed(() =>
(detailpanel as any[]).filter(
(field: any) =>
!field.visibleWhenDelivery || field.visibleWhenDelivery.includes(form.value.delivery_method)
)
)
const saveLoading = ref(false)
/** 货主下拉选项(沿用 availableFields 中的 store_id 选项,focus 时远程加载) */

View File

@ -24,8 +24,9 @@
<div class="table-host">
<upper-table
ref="tableRef"
table-id="storage-receiving-storage-records"
:data="pagedTableData"
:data="tableData"
:columns="columns"
default-align="center"
table-size="small"
@ -48,14 +49,24 @@
</template>
<script setup lang="ts">
import { ref, reactive, computed, watch } from 'vue'
import { ref, reactive, watch, nextTick } from 'vue'
import { useRouter } from 'vue-router'
import { ElMessage } from 'element-plus'
import UpperTable from '@/components/UpperTable/index.vue'
import * as entryApi from '@/api/storage.entry/entry'
import * as inventoryApi from '@/api/storage.inventory/inventory'
import { formatInventoryTypeLabel } from '@/views/storage/inventory/inventory-config'
const props = defineProps<{
id?: number | string | null
row?: any
}>()
const router = useRouter()
const loading = ref(false)
const tableData = ref<any[]>([])
const queryTime = ref(0)
const tableRef = ref<any>(null)
/** 表格勾选行(UpperTable selection-change) */
const selectedRows = ref<Record<string, any>[]>([])
@ -66,13 +77,14 @@ function handleSelectionChange(rows: Record<string, any>[]) {
/** 列配置与「商品明细」一致:统一 default-align="center"、small 尺寸 */
const columns = [
{ prop: 'zone_name', label: '库区', width: 150, fixed: 'left' },
{ prop: 'location_code', label: '库位', width: 120 },
{ prop: 'quantity', label: '数量' },
{ prop: 'batch_no', label: '批次' },
{ prop: 'production_date', label: '生产日期' },
{ prop: 'expiration_date', label: '过期日期' },
{ prop: 'stock_type', label: '库存类型' }
{ prop: 'inbound_order_no', label: '入库单号', minWidth: 170, fixed: 'left', showOverflowTooltip: true },
{ prop: 'zone_name', label: '库区', width: 140 },
{ prop: 'space_code', label: '库位', width: 160 },
{ prop: 'quantity', label: '数量', width: 90 },
{ prop: 'batch_no', label: '批次', width: 130 },
{ prop: 'production_date', label: '生产日期', width: 120 },
{ prop: 'expiry_date', label: '过期日期', width: 120 },
{ prop: 'inventory_type', label: '库存类型', width: 100 }
]
const pagination = reactive({
@ -81,36 +93,112 @@ const pagination = reactive({
total: 0
})
/** 前端分页(接口一次性返回全部入库记录时使用) */
const pagedTableData = computed(() => {
const start = (pagination.currentPage - 1) * pagination.pageSize
return tableData.value.slice(start, start + pagination.pageSize)
})
function toText(value: any): string {
return value === null || value === undefined ? '' : String(value).trim()
}
watch(tableData, (rows) => {
pagination.total = rows.length
const maxPage = Math.max(1, Math.ceil(rows.length / pagination.pageSize))
if (pagination.currentPage > maxPage) pagination.currentPage = maxPage
})
/** 库位展示:编码(自定义名称) */
function resolveSpaceLabel(space: any): string {
if (!space) return '--'
const code = toText(space.space_code ?? space.code)
const custom = toText(space.custom_name ?? space.space_name ?? space.name)
if (code && custom) return `${code}(${custom})`
return code || custom || '--'
}
/**
* 查该收货单关联的入库单号:
* storage.entry.list 的 where.quickWhere 文档声明支持 receiving_id(通过 wms_entry_order_receiving 关联搜索)
*/
async function fetchRelatedEntryCodes(): Promise<string[]> {
const receivingId = Number(props.id)
if (!Number.isFinite(receivingId) || receivingId <= 0) return []
const res: any = await entryApi.getEntryList({
pagination: { page: 1, pageSize: 100 },
where: { quickWhere: String(receivingId) }
})
const list: any[] = Array.isArray(res?.data?.list) ? res.data.list : []
return list.map((item: any) => toText(item?.entry_order_code)).filter(Boolean)
}
async function loadData() {
const receivingId = Number(props.id)
if (!Number.isFinite(receivingId) || receivingId <= 0) {
tableData.value = []
pagination.total = 0
return
}
loading.value = true
const startedAt = Date.now()
try {
// 1) 收货单 → 关联入库单号
const codes = await fetchRelatedEntryCodes()
if (!codes.length) {
tableData.value = []
pagination.total = 0
return
}
// 2) 按入库单号查库存明细(wms_storage 真实入库结果,按批次返回)
const res: any = await inventoryApi.getInventoryList({
where: { inbound_order_no: { operator: 'in', value: codes } },
pagination: { page: pagination.currentPage, pageSize: pagination.pageSize },
group_by_batch: true
})
const data = res?.data && typeof res.data === 'object' ? res.data : res
const list: any[] = Array.isArray(data?.list) ? data.list : []
tableData.value = list.map((item: any) => ({
id:
item?.id ??
`${item?.stock_id ?? ''}-${item?.space_id ?? ''}-${item?.batch_no ?? ''}-${item?.inventory_type ?? ''}`,
inbound_order_no: toText(item?.inbound_order_no) || '--',
zone_name: toText(item?.space?.zone_name ?? item?.zone_name) || '--',
space_code: resolveSpaceLabel(item?.space),
quantity: item?.quantity ?? 0,
batch_no: toText(item?.batch_no) || '--',
production_date: toText(item?.production_date) || '--',
expiry_date: toText(item?.expiry_date ?? item?.expiration_date) || '--',
inventory_type: formatInventoryTypeLabel(item?.inventory_type)
}))
pagination.total = Number(data?.pagination?.total ?? data?.total ?? list.length) || 0
} catch (error) {
console.error('加载入库记录失败', error)
ElMessage.error('加载入库记录失败')
tableData.value = []
pagination.total = 0
} finally {
queryTime.value = Date.now() - startedAt
loading.value = false
}
}
function handlePageChange(page: number) {
pagination.currentPage = page
void loadData()
nextTick(() => tableRef.value?.getTableRef?.()?.setScrollTop?.(0))
}
function handlePageSizeChange(size: number) {
pagination.pageSize = size
pagination.currentPage = 1
void loadData()
nextTick(() => tableRef.value?.getTableRef?.()?.setScrollTop?.(0))
}
function loadData() {
loading.value = true
const start = Date.now()
// 暂无库存详情接口,保持与 Vue2 一致
setTimeout(() => {
loading.value = false
queryTime.value = Date.now() - start
}, 300)
}
watch(
() => props.id,
(val) => {
selectedRows.value = []
nextTick(() => tableRef.value?.clearSelection?.())
if (val) {
pagination.currentPage = 1
void loadData()
} else {
tableData.value = []
pagination.total = 0
}
},
{ immediate: true }
)
function goToStorageLog() {
router.push('/storage/log')

View File

@ -26,6 +26,37 @@
:layout-key="toolbarLayoutKey"
@action="handleToolbarButtonClick"
/>
<!-- 顶层参数 filterDepleted:隐藏明细已被其他入库单占满的收货单 -->
<el-checkbox
v-model="filterDepleted"
class="toolbar-flag"
title="只显示仍有可入库量的收货单(所有明细未被其他入库单占满)"
@change="handleFilterDepletedChange"
>
隐藏无可用量
</el-checkbox>
<!-- 顶层参数 entry_order_id:只看与该入库单有商品交集的收货单 -->
<el-button
size="small"
plain
class="toolbar-entry-filter"
:class="{ 'is-active': !!selectedEntryOrderId }"
:title="selectedEntryOrderId ? `当前筛选:${selectedEntryOrderCode}(点击切换)` : '选择入库单,只看与其有商品交集的收货单'"
@click="openEntryFilterDialog"
>
{{ selectedEntryOrderId ? `入库单:${selectedEntryOrderCode}` : '按入库单筛选' }}
</el-button>
<el-button
v-if="selectedEntryOrderId"
size="small"
link
type="primary"
@click="clearEntryFilter"
>
清除
</el-button>
</div>
</div>
@ -320,6 +351,102 @@
</div>
</el-dialog>
<!-- 按入库单筛选:选中入库单后只显示与其有商品交集的收货单(接口顶层参数 entry_order_id) -->
<el-dialog
v-model="entryFilterDialogVisible"
class="entry-filter-dialog"
width="min(680px, 92vw)"
align-center
append-to-body
:show-close="false"
:close-on-click-modal="false"
@closed="resetEntryFilterDialog"
>
<div class="task-panel">
<header class="task-panel__head">
<div class="task-panel__titles">
<h2>按入库单筛选收货单</h2>
<p>选中入库单后,列表只显示与其有商品交集的收货单</p>
</div>
<button
class="task-panel__close"
type="button"
aria-label="关闭"
@click="entryFilterDialogVisible = 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">
<div class="entry-filter-search">
<el-input
v-model="entryFilterKeyword"
size="small"
clearable
placeholder="入库单号 / 采购单号 / 供应商 / 货主 / 仓库"
@keyup.enter="handleEntryFilterKeyword"
@clear="handleEntryFilterKeyword"
/>
<el-button size="small" type="primary" @click="handleEntryFilterKeyword">查询</el-button>
</div>
<div class="entry-filter-table">
<el-table
:data="entryFilterList"
v-loading="entryFilterLoading"
highlight-current-row
border
size="small"
height="100%"
@current-change="onEntryFilterRowChange"
>
<el-table-column prop="entry_order_code" label="入库单号" min-width="170" show-overflow-tooltip />
<el-table-column label="来源" width="90" align="center">
<template #default="{ row: e }">{{ entrySourceLabel(e.source_type) }}</template>
</el-table-column>
<el-table-column label="入库状态" width="110" align="center">
<template #default="{ row: e }">
<span :class="getStatusTextClass(entryOrderStatusTag(e.order_status))">
{{ entryOrderStatusLabel(e.order_status) }}
</span>
</template>
</el-table-column>
</el-table>
</div>
<el-pagination
class="entry-filter-pagination"
size="small"
layout="total, prev, pager, next"
:current-page="entryFilterPagination.page"
:page-size="entryFilterPagination.pageSize"
:total="entryFilterPagination.total"
@current-change="handleEntryFilterPageChange"
/>
</div>
<footer class="task-panel__foot">
<span class="task-panel__hint">
{{
entryFilterSelected
? '已选:' + (entryFilterSelected.entry_order_code || entryFilterSelected.id)
: '未选择入库单'
}}
</span>
<div class="task-panel__actions">
<el-button size="small" @click="clearEntryFilterFromDialog">清除筛选</el-button>
<el-button size="small" @click="entryFilterDialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :disabled="!entryFilterSelected" @click="confirmEntryFilter">
确定
</el-button>
</div>
</footer>
</div>
</el-dialog>
<!-- 匹配入库:左右结构,左选入库单,右对比明细 -->
<el-dialog
v-model="matchPutawayDialogVisible"
@ -554,12 +681,26 @@ const hasSelection = ref(false)
const selectedReceivingId = ref<number | string | null>(null)
const detailVisible = ref(true)
const quickSearch = ref('')
const currentSort = reactive({ prop: '', order: '' })
const currentCondition = ref<any>(null)
// 保存原始条件(可能包含 operator 等信息)
const currentConditionRaw = ref<any>(null)
/** 顶层参数 filterDepleted:只显示仍有可入库量的收货单(明细未被其他入库单占满) */
const filterDepleted = ref(false)
/** 顶层参数 entry_order_id:只看与该入库单有商品交集的收货单 */
const selectedEntryOrderId = ref<number | null>(null)
const selectedEntryOrderCode = ref('')
/** 入库单选择弹窗(仅用于设置 entry_order_id 筛选) */
const entryFilterDialogVisible = ref(false)
const entryFilterKeyword = ref('')
const entryFilterLoading = ref(false)
const entryFilterList = ref<any[]>([])
const entryFilterSelected = ref<any>(null)
const entryFilterPagination = reactive({ page: 1, pageSize: 10, total: 0 })
const componentMap: Record<string, any> = {
details: Details,
storage: StorageComp,
@ -696,13 +837,12 @@ async function loadData() {
const params: any = {
pagination: { page: pagination.currentPage, pageSize: pagination.pageSize },
where,
order: currentSort.prop ? { [currentSort.prop]: currentSort.order === 'ascending' ? 'ASC' : 'DESC' } : undefined,
...topParams
}
if (quickSearch.value) {
params.where.receiving_number = { operator: 'like', value: quickSearch.value, type: 'text' }
}
// 顶层参数:过滤掉无可用量的收货单(文档 filterDepleted,默认 false)
if (filterDepleted.value) params.filterDepleted = true
// 顶层参数:按入库单商品交集过滤(文档 entry_order_id)
if (selectedEntryOrderId.value) params.entry_order_id = selectedEntryOrderId.value
const res: any = await receivingApi.getReceivingList(params)
if (res && res.code === 200) {
@ -763,6 +903,17 @@ function extractTopLevelParams(condition: any): Record<string, any> {
return params
}
/**
* quickWhere:项目惯例直接传字符串(服务端在单号/车牌/物流单号等字段 OR 模糊),
* 不能包成 { operator, value } 对象
*/
function assignQuickWhere(source: any, where: Record<string, any>) {
const raw = source?.quickWhere
const text = raw && typeof raw === 'object' && 'value' in raw ? (raw as any).value : raw
if (text === undefined || text === null || String(text).trim() === '') return
where.quickWhere = String(text).trim()
}
function normalizeToWhere(condition: any) {
if (!condition) return {}
@ -822,8 +973,9 @@ function normalizeToWhere(condition: any) {
// 如果来自 ScanBox 的 preset(包含 conditions)
if (condition.conditions && typeof condition.conditions === 'object') {
const where: any = {}
assignQuickWhere(condition.conditions, where)
Object.keys(condition.conditions).forEach(k => {
if (TOP_LEVEL_FIELDS.includes(k)) return
if (TOP_LEVEL_FIELDS.includes(k) || k === 'quickWhere') return
const result = processConditionValue(k, condition.conditions[k])
if (result) where[k] = result
})
@ -833,8 +985,9 @@ function normalizeToWhere(condition: any) {
// 普通自定义条件对象,键 -> { value, operator, ... } 或 键 -> 简单值
if (typeof condition === 'object') {
const where: any = {}
assignQuickWhere(condition, where)
Object.keys(condition).forEach(k => {
if (TOP_LEVEL_FIELDS.includes(k)) return
if (TOP_LEVEL_FIELDS.includes(k) || k === 'quickWhere') return
const result = processConditionValue(k, condition[k])
if (result) where[k] = result
})
@ -855,6 +1008,11 @@ function handleConditionChange(condition: any) {
loadData()
}
/**
* 排序:后端 getReceivingList 暂不支持。
* 传 sort 会直接 500(Unknown column 'wms_receiving.create_at' in 'order clause'),
* 详见 workflows/api-doc-agent/config/接口差异.md,后端修复后再恢复下发。
*/
function handleSortChange({ prop, order }: any) {
currentSort.prop = prop
currentSort.order = order
@ -980,11 +1138,97 @@ function handlePageSizeChange(size: number) {
loadData()
}
function onQuickSearch() {
/** filterDepleted 切换:回到第一页重新查询 */
function handleFilterDepletedChange() {
pagination.currentPage = 1
loadData()
}
/** 打开入库单筛选弹窗 */
async function openEntryFilterDialog() {
entryFilterDialogVisible.value = true
entryFilterKeyword.value = ''
entryFilterSelected.value = null
entryFilterPagination.page = 1
await fetchEntryFilterList()
}
function handleEntryFilterKeyword() {
entryFilterPagination.page = 1
void fetchEntryFilterList()
}
function handleEntryFilterPageChange(page: number) {
entryFilterPagination.page = page
void fetchEntryFilterList()
}
async function fetchEntryFilterList() {
entryFilterLoading.value = true
try {
const keyword = entryFilterKeyword.value.trim()
const where: Record<string, any> = {}
// quickWhere:项目惯例传字符串(服务端在入库单号/采购单号/供应商/货主/仓库等字段模糊匹配)
if (keyword) where.quickWhere = keyword
const res: any = await entryApi.getEntryList({
pagination: { page: entryFilterPagination.page, pageSize: entryFilterPagination.pageSize },
where
})
if (res && res.code === 200 && res.data) {
entryFilterList.value = res.data.list || []
entryFilterPagination.total = res.data.pagination?.total ?? 0
} else {
entryFilterList.value = []
entryFilterPagination.total = 0
if (res?.message) ElMessage.error(res.message)
}
} catch (e) {
console.error('加载入库单列表失败', e)
ElMessage.error('加载入库单列表失败')
entryFilterList.value = []
entryFilterPagination.total = 0
} finally {
entryFilterLoading.value = false
}
}
function onEntryFilterRowChange(row: any) {
entryFilterSelected.value = row || null
}
function confirmEntryFilter() {
const row = entryFilterSelected.value
if (!row?.id) {
ElMessage.warning('请选择一条入库单')
return
}
selectedEntryOrderId.value = Number(row.id)
selectedEntryOrderCode.value = String(row.entry_order_code || row.id)
entryFilterDialogVisible.value = false
pagination.currentPage = 1
loadData()
}
function clearEntryFilter() {
selectedEntryOrderId.value = null
selectedEntryOrderCode.value = ''
pagination.currentPage = 1
loadData()
}
function clearEntryFilterFromDialog() {
entryFilterDialogVisible.value = false
clearEntryFilter()
}
function resetEntryFilterDialog() {
entryFilterKeyword.value = ''
entryFilterSelected.value = null
entryFilterList.value = []
entryFilterPagination.page = 1
entryFilterPagination.total = 0
}
function openColumnConfigPanel() {
upperTable.value?.openColumnConfig?.()
}
@ -1830,10 +2074,12 @@ async function handleDirectPutaway() {
}
function buildExportPayload() {
if (currentCondition.value && currentCondition.value !== 'reset') {
return { where: normalizeToWhere(currentCondition.value) }
}
return { where: normalizeToWhere({}) }
const condition = currentCondition.value && currentCondition.value !== 'reset' ? currentCondition.value : {}
const payload: Record<string, any> = { where: normalizeToWhere(condition) }
// 顶层参数(stock_query_where 等)与列表保持一致,否则导出会丢失「按商品维度」筛选
Object.assign(payload, extractTopLevelParams(currentConditionRaw.value))
// 导出接口虽声明支持 sort,但与列表同源实现,统一暂不下发(见 接口差异.md)
return payload
}
function buildExportSelectedPayload() {
@ -2221,6 +2467,47 @@ async function handleExportAll() {
text-align: left;
}
}
/* 工具栏:新增开关与「按入库单筛选」后允许换行,垂直居中(覆盖 list-page.scss 的 flex-start) */
.order-sub-container .main-content .toolbar .toolbar-left {
flex-wrap: wrap;
align-items: center;
row-gap: 6px;
}
/* 工具栏内的布尔开关(filterDepleted):与按钮组同高(24px),字号对齐 small 按钮 */
.toolbar-flag {
display: inline-flex;
align-items: center;
height: 24px;
margin: 0;
/* 只覆盖字号/间距;颜色、勾选框尺寸与选中态全部交给 Element Plus,
否则未选中灰/选中主色的联动会被覆盖,勾选后样式异常 */
:deep(.el-checkbox__label) {
font-size: 12px;
line-height: 16px;
padding-left: 6px;
}
}
/* 工具栏「按入库单筛选」:命中时高亮,与普通按钮区分 */
.toolbar-entry-filter {
max-width: 220px;
overflow: hidden;
:deep(span) {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
&.is-active {
color: var(--el-color-primary);
border-color: var(--el-color-primary);
background: var(--el-color-primary-light-9);
}
}
</style>
<style lang="scss">
@ -2239,6 +2526,7 @@ async function handleExportAll() {
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板(同手工录入运单号) */
.el-dialog.reject-receiving-dialog,
.el-dialog.create-receiving-dialog,
.el-dialog.entry-filter-dialog,
.el-dialog.match-putaway-dialog-shell {
padding: 0;
overflow: hidden;
@ -2251,4 +2539,50 @@ async function handleExportAll() {
padding: 0;
}
}
/* 按入库单筛选弹窗:搜索行 + 表格 + 分页(表头固定高度,分页靠右) */
.entry-filter-dialog {
.entry-filter-search {
display: flex;
align-items: center;
gap: 6px;
margin-bottom: 8px;
flex-shrink: 0;
.el-input {
flex: 1;
min-width: 0;
}
.el-button {
margin-left: 0;
}
}
.entry-filter-table {
/* 固定高度,避免在 body 的 column flex 里被压成 0 */
flex: 0 0 320px;
height: 320px;
min-height: 320px;
overflow: hidden;
border-radius: 4px;
}
.entry-filter-pagination {
flex-shrink: 0;
display: flex;
justify-content: flex-end;
margin: 8px 0 0;
padding: 0;
}
.task-panel__foot {
.task-panel__hint {
min-width: 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
}
</style>

View File

@ -211,6 +211,15 @@ export const receivingStoreColumns = [
// receiving配置(对标待处理订单 ScanBox 分组排序)
export const availableFields: ReceivingScanFieldConfig[] = [
// ===== 基础信息 =====
// 快捷搜索:对应 where.quickWhere(服务端在收货单号/车牌/物流单号等字段 OR 模糊),直接传字符串
receivingScanBasicField({
value: 'quickWhere',
label: '快捷搜索',
type: 'text',
placeholder: '收货单号/车牌号/物流单号',
hideOperator: true,
defaultOperator: 'eq'
}),
receivingScanBasicField({
value: 'receiving_number',
label: '收货单号',
@ -420,6 +429,10 @@ export const detailpanel = [
// { prop: 'storage_status', label: '入库状态', type: 'select' },
{ prop: 'delivery_method', label: '来货方式', type: 'select' },
{ prop: 'license_plate', label: '车牌号', type: 'input' },
// 物流单号:仅快递/空运/海运可填(与 save 接口的清空规则一致,由 DetailsPanel 按来货方式过滤显示)
{ prop: 'tracking_number', label: '物流单号', type: 'input', visibleWhenDelivery: ['express', 'air_freight', 'sea_freight'] },
// 录像设备ID:与设备录像关联的标识(save 支持 video_device_id)
{ prop: 'video_device_id', label: '录像设备ID', type: 'input' },
{ prop: 'loading_method', label: '装卸方式', type: 'select' },
// { prop: 'total_items', label: '商品种类', type: 'number' },
// { prop: 'total_quantity', label: '总数量', type: 'number' },

View File

@ -174,7 +174,7 @@
<template #column-images="{ row }">
<RecordImages :images="rowImages(row)" :max="2" />
</template>
<!-- 操作列:商品行/库位行的商品 → 上报;**无商品的库位行 → 标记为空** -->
<!-- 操作列:商品行/库位行的商品 → 上报;**无商品的库位行 → 标记为空**;未开始作业时 → 删除明细 -->
<template #column-actions="{ row }">
<el-button
v-if="isReportableRow(row)"
@ -195,7 +195,23 @@
>
标记为空
</el-button>
<span v-else class="hint-text">—</span>
<!-- 删除明细(stock.check.detailDelete):仅「未开始作业」状态可删,且只针对明细行(非平铺子行) -->
<el-button
v-if="canDeleteDetail(row)"
link
type="danger"
size="small"
:loading="deletingDetailId === Number(row.item?.id)"
@click="handleDeleteDetail(row)"
>
删除
</el-button>
<span
v-if="!isReportableRow(row) && !canMarkEmpty(row) && !canDeleteDetail(row)"
class="hint-text"
>
—
</span>
</template>
<template #empty>
@ -227,6 +243,7 @@ import UpperTable from '@/components/UpperTable/index.vue'
import RecordImages from './RecordImages.vue'
import CheckReportDialog from './CheckReportDialog.vue'
import {
stockCheckDetailDelete,
stockCheckFinish,
stockCheckMarkEmpty,
stockCheckReport,
@ -757,6 +774,9 @@ async function doReport(target: ReportTarget, silent = false): Promise<boolean>
const reportDialogVisible = ref(false)
/** 「标记为空」进行中的明细ID(按钮 loading) */
const markingEmptyId = ref<number | null>(null)
/** 「删除明细」进行中的明细ID(按钮 loading) */
const deletingDetailId = ref<number | null>(null)
/** 弹窗目标快照(打开时定格,避免表格重渲染后引用漂移) */
const reportTarget = ref<{
item: Record<string, any>
@ -864,6 +884,50 @@ async function handleMarkEmpty(row: Record<string, any>) {
}
}
/** 是否允许删除该明细:仅未开始作业(created/rejected),且只能删明细行本身(非平铺子行) */
function canDeleteDetail(row: Record<string, any>): boolean {
if (!canAddItems.value) return false
// 平铺子行(库位任务的商品/未知商品)不承载明细,不能单独删
if (row?.stock || row?.is_unknown) return false
const detailId = Number(row?.item?.id)
return Number.isFinite(detailId) && detailId > 0
}
/** 删除盘点明细(stock.check.detailDelete:id + detail_ids,单条也传数组) */
async function handleDeleteDetail(row: Record<string, any>) {
const detailId = Number(row?.item?.id)
if (!taskId.value || !Number.isFinite(detailId) || detailId <= 0) return
const label = isLocationTask.value
? `库位「${formatLocationCodes(row?.item ?? row)}」`
: `商品「${row?.item_name || row?.item_code || detailId}」`
try {
await ElMessageBox.confirm(
`确定删除${label}的盘点明细?\n删除后该行会从盘点范围中移除,且不可恢复。`,
'删除盘点明细',
{ confirmButtonText: '确定删除', cancelButtonText: '取消', type: 'warning', buttonSize: 'small' }
)
} catch {
return
}
deletingDetailId.value = detailId
try {
const res: any = await stockCheckDetailDelete({ id: taskId.value, detail_ids: [detailId] })
if (!isCheckApiSuccess(res)) {
throw new Error(res?.message || '删除盘点明细失败')
}
ElMessage.success('明细已删除')
// 明细数与进度由后端重算 → 重拉明细 + 通知宿主刷新列表
await loadItems()
emit('changed')
} catch (e: any) {
console.error('[stockcheck] 删除盘点明细失败', e)
ElMessage.error(e?.message || '删除盘点明细失败')
} finally {
deletingDetailId.value = null
}
}
/**
* 批量上报:上报表格中**勾选**的行(逐行串行提交,避免并发写同一盘点单)。
* 已勾选但未填写实盘数量的行会被跳过并提示。

View File

@ -273,6 +273,40 @@
:meta="detailExportTaskProgress"
:update-time="detailExportTaskProgress.updateTime"
/>
<!-- 盘点明细导出模式(stock.check.exportDetail 的 mode,仅商品类任务生效;库位类后端忽略) -->
<el-dialog
v-model="exportDetailModeVisible"
title="导出盘点明细"
width="min(460px, 92vw)"
align-center
append-to-body
:close-on-click-modal="false"
>
<div class="export-detail-mode">
<p class="export-detail-mode__tip">
商品类任务可选择导出形式;库位类任务固定导出「盘点明细」Sheet。
</p>
<el-radio-group v-model="exportDetailMode">
<el-radio value="location">按库位明细(每商品每库位一行)</el-radio>
<el-radio value="summary">明细汇总(每商品一行 + 商品差异)</el-radio>
</el-radio-group>
</div>
<template #footer>
<div class="export-detail-mode__actions">
<el-button size="small" @click="exportDetailModeVisible = false">取消</el-button>
<el-button
size="small"
type="primary"
:loading="detailExportLoading"
@click="confirmExportDetailMode"
>
开始导出
</el-button>
</div>
</template>
</el-dialog>
<!-- ===== 驳回盘点单(对齐 storage/receiving「批量驳回收货单」) ===== -->
<el-dialog
v-model="rejectDialogVisible"
@ -450,7 +484,8 @@ import {
stockCheckExportDetail,
stockCheckExportTaskProgress,
stockCheckFinish,
stockCheckSubmit
stockCheckSubmit,
type StockCheckExportDetailMode
} from '@/api/stock.check/stock.check'
// ============================================================
@ -822,6 +857,12 @@ async function doExport() {
// ============================================================
// 导出盘点明细(stock.check.exportDetail 单任务异步导出,进度复用 exportTaskProgress)
// ============================================================
/** 明细导出模式选择(mode:location=按库位明细 / summary=明细汇总) */
const exportDetailModeVisible = ref(false)
const exportDetailMode = ref<StockCheckExportDetailMode>('location')
const exportDetailTargetRow = ref<Record<string, any> | null>(null)
const {
exportLoading: detailExportLoading,
exportDialogVisible: detailExportDialogVisible,
@ -843,7 +884,10 @@ const {
* 商品类任务默认按库位区分明细(不传 mode → 后端默认 location);
* 库位类任务后端忽略 mode,导出 Sheet「盘点明细」。
*/
async function doExportDetail(row: Record<string, any> | null | undefined) {
async function doExportDetail(
row: Record<string, any> | null | undefined,
mode?: StockCheckExportDetailMode
) {
const id = Number(row?.id)
if (!Number.isFinite(id) || id <= 0) {
ElMessage.warning('未识别到有效的盘点任务ID')
@ -857,7 +901,23 @@ async function doExportDetail(row: Record<string, any> | null | undefined) {
ElMessage.warning('已有盘点明细导出任务提交中,请稍候')
return
}
await submitDetailExportTask({ id })
// 商品类任务:未指定模式时先让用户选「按库位明细 / 明细汇总」;库位类任务后端忽略 mode,直接导出
if (!mode && !isLocationScopeType(row?.type)) {
exportDetailTargetRow.value = row ?? null
exportDetailMode.value = 'location'
exportDetailModeVisible.value = true
return
}
await submitDetailExportTask({ id, ...(mode ? { mode } : {}) })
}
/** 明细导出模式弹窗:确认后按所选 mode 提交
*/
function confirmExportDetailMode() {
const row = exportDetailTargetRow.value
exportDetailModeVisible.value = false
if (!row) return
void doExportDetail(row, exportDetailMode.value)
}
/** 明细面板「导出明细」按钮(目标为当前选中行) */
@ -1490,6 +1550,43 @@ onMounted(() => {
}
}
}
/* 盘点明细导出模式弹窗:提示 + 纵向单选项 */
.export-detail-mode {
display: flex;
flex-direction: column;
gap: 12px;
&__tip {
margin: 0;
font-size: 12px;
line-height: 18px;
color: #909399;
}
:deep(.el-radio-group) {
display: flex;
flex-direction: column;
align-items: flex-start;
gap: 10px;
}
:deep(.el-radio) {
margin-right: 0;
font-size: 13px;
}
&__actions {
display: flex;
justify-content: flex-end;
gap: 6px;
:deep(.el-button) {
margin-left: 0;
margin-right: 0;
}
}
}
</style>
<style lang="scss">