feat(order): 支持按 SN 码反查订单,完善 SN 订单限制与接口配置

- 订单列表、待处理、复核、异常、归档的 ScanBox 新增「SN码」字段,
  支持单码、逗号/空格/分号分隔多码及数组输入,按完整 SN 码精确匹配
- 批量快捷复核识别 SN 订单:提交前提示该批不支持,结果中统计 SN 相关失败,
  引导改用单订单复核并提交 sn_map
- 波次抓取团购单弹窗新增「返回订单 ID 列表」开关(return_order_ids),
  勾选后追加订单 ID 列并支持多值折叠复制;波次列表新增本地排序兜底与
  时间格式化,策略列表在接口仅支持 strategy_type 时改为前端筛选+分页
- 导出白名单对齐接口 57 项(补充拦截状态、复核时间),明确传入白名单后
  服务端只输出白名单内列
- 库存明细新增「按批次 / 按库位合并」切换(group_by_batch),
  库存列表与导出参数跟随表头当前排序
- 店铺接口配置新增天意云 OMS 固定类型(interface_type_id=3),
  回调地址统一由系统配置、不再下发,移除 api_version / 联系人等废弃入参
This commit is contained in:
yin 2026-11-14 18:00:15 +08:00
parent aeb13757ea
commit dcdc3b6fd3
24 changed files with 581 additions and 172 deletions

View File

@ -24,7 +24,9 @@ export type OrderListParams = {
* {"create_channel":{"operator":"in","value":["QM","API"]}} 标准结构多选;{"create_channel":{"operator":"ne","value":"MANUAL"}} 排除指定渠道。
* 注意:列表响应中的 create_channel 已格式化为中文标签,查询条件须传英文枚举值。 * - is_sn_order 是否含 SN(序列号) 商品筛选(后端订单分表 has_sn_item enum Y/N 归一化后输出):
* {"is_sn_order":"Y"} 仅含 SN 商品订单;{"is_sn_order":"N"} 仅无 SN 商品订单。
* 响应行同时返回 has_sn_item(原始列)与 is_sn_order(归一化),前端筛选/展示统一用 is_sn_order。 */
* 响应行同时返回 has_sn_item(原始列)与 is_sn_order(归一化),前端筛选/展示统一用 is_sn_order。
* - sn_code / snCode / sn_codes / snCodes 按 SN 码反查订单(先查 wms_order_item_sn 拿 order_id 再回填,订单表结构不变):
* 值支持单个字符串、逗号/空格/分号分隔多个码、字符串数组或 { value } 结构,按完整 SN 码精确匹配。 */
where?: Record<string, any>
sort?: {
sortField?: string
@ -186,12 +188,12 @@ export type OrderExportParams = {
* 导出表头字段白名单(中文表头字符串数组,如 ["系统订单号","外部订单号"]);不传或空数组时输出全部列。
* 支持 export_columns 与 exportColumns 两种写法。
*
* 文档枚举共 55 个(校验不区分导出模式,选中当前模式不存在的表头时该列自动忽略;传入非法表头会报错并列出非法值):
* 系统订单号、外部订单号、平台单号、订单ID、订单号、外部单号、订单状态、抓取波次号、波次号、波次序号、
* 文档枚举共 57 个(校验不区分导出模式,选中当前模式不存在的表头时该列自动忽略;传入非法表头会报错并列出非法值):
* 系统订单号、外部订单号、平台单号、订单ID、订单号、外部单号、订单状态、拦截状态、抓取波次号、波次号、波次序号、
* 货主、平台、来源、店铺昵称、收件人、收件人电话、省、市、区、镇、详细地址、商品明细、仓库商品名称、
* 商品条码、商品图片、数量、物流公司、运单号、业务类型、运单接口、包材ID、包材编码、包材名称、分配时间、
* 订单商品总类数、订单商品总数、SN码数量、SN码、SN码汇总、商品重量、称重重量(g)、订单金额、实收金额、创建时间、支付时间、发货时间、
* 出库状态、复核状态、复核完成状态、配货状态、打包状态、备注、买家留言、卖家留言、归档时间。
* 出库状态、复核状态、复核完成状态、复核时间、配货状态、打包状态、备注、买家留言、卖家留言、归档时间。
* 其中仅 waybill 输出:系统订单号、外部订单号、平台单号、抓取波次号、商品明细、SN码汇总;
* 仅 item 输出:订单ID、订单号、外部单号、波次号、仓库商品名称、商品条码、商品图片、数量、SN码。
* 「SN码数量」(sn_quantity)= 启用序列号管理商品(stock_warehouse.is_sn_mgmt='Y')的 plan_qty 合计;
@ -199,7 +201,7 @@ export type OrderExportParams = {
* 「SN码」(sn_codes, item):该商品行复核时登记的 SN 码列表(状态限定 BOUND/VERIFIED/REISSUED,排除退回/作废);
* 「SN码汇总」(sn_codes_summary, waybill):整单全部已登记 SN 码汇总,仅主单号行输出。
* ⚠️ 白名单不含「领料状态」「确认打印状态」(列表页有该状态列,但导出不支持,传入会报错)。
* ⚠️ 「复核时间」(recheck_time) 已由后端支持(2026-10-08 确认),文档枚举暂未收录,保留在可选列中。
* ⚠️ **一旦传入白名单,服务端只输出白名单内的列**:新增列必须同步加入前端可选清单,否则不会出现在导出表头中。
* 前端字段清单见 views/order/orderManagement/config/order-common-config.ts 的 ORDER_EXPORT_ALL_COLUMNS。
*/
export_columns?: string[]

View File

@ -52,6 +52,7 @@ export type PendingOrderListParams = {
* claim_status 领料状态筛选(按订单表列过滤;枚举:none=未领料、padding=领料中、fin=已领料、error=异常):
* 例 {"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 回填,支持单值/分隔字符串/数组,完整码精确匹配)。
*/
where?: OrderWhere;
sort?: OrderSort;

View File

@ -25,6 +25,7 @@ export type ReviewOrderListParams = {
* {"create_channel":{"operator":"in","value":["QM","API"]}} 标准结构多选;{"create_channel":{"operator":"ne","value":"MANUAL"}} 排除指定渠道。
* 注意:列表响应中的 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 回填,支持单值/分隔字符串/数组,完整码精确匹配)。
*/
where?: OrderWhere
sort?: OrderSort

View File

@ -216,6 +216,7 @@ export type WaveGroupOrderFetchListParams = {
same_order_quantity?: number
shop_name?: string
include_sku?: string
/** 是否在响应里返回组内订单 ID(order_ids);「抓取团购单」弹窗勾选「返回订单 ID 列表」时下发 true */
return_order_ids?: boolean
}
@ -1107,7 +1108,7 @@ export type WaveSingleFetchByIdsResponse = {
excluded_locked_order_ids?: Array<number>
skipped_order_ids?: Array<number>
not_found_order_ids?: Array<number>
/** 因 SN(序列号管理)被排除、未加入波次的订单 ID 列表 */
/** 因 SN(序列号管理)被排除、未加入波次的订单 ID 列表;SN 订单现已允许按订单抓取,该字段恒为空数组(保留兼容) */
excluded_sn_order_ids?: Array<number>
}

View File

@ -363,25 +363,35 @@ export function listApiConfig(data: {
} as any)
}
/** 保存接口配置(新增或更新)
* - app_name:必传,不再自动生成
* - QM_WMS 类型:须填写 qimen_app_key(ERP)/ qimen_warehouse_code
* - OPEN_API 类型:系统自动生成 self_app_key(WMS+32位HEX)和 self_app_secret(64位HEX),无需传入奇门字段
/**
* 保存接口配置(新增或更新)
*
* 对齐 2026-11-14 最新接口设计:
* - id:签约关系ID(兼容 contract_id)
* - interface_type_id:必须是 wms_interface_type 已存在的类型;
* ⚠️ 签约关系级配置统一按「货主开放接口」落库——传 3(OPEN_API_WAREHOUSE 仓库开放接口)时
* 服务端自动映射为 2(OPEN_API 货主开放接口),货主主体也可维护
* - app_name:必传(不再自动生成)
* - QM_WMS 类型:须填写 qimen_app_key(ERP)/ qimen_customer_id / qimen_warehouse_code
* - OPEN_API 类型:系统自动生成 self_app_key(WMS+32位HEX)与 self_app_secret(64位HEX),无需奇门字段
* - callback_url:**已不是有效入参**,传入不生效;回调地址统一取 config.openapi.defaultCallbackUrl
* - 响应无业务字段(成功判定看 flag/code)
*/
export function saveApiConfig(data: {
id: number
interface_type_id: number
/** 应用名称(必传,不再自动生成) */
/** 应用名称(必传) */
app_name: string
/** ERP AppKey(来自 index.getQimenAppList 下拉选择) */
/** ERP AppKey(来自 index.getQimenAppList 下拉选择,QM_WMS 必填) */
qimen_app_key?: string
/** 奇门客户ID(QM_WMS 必填) */
qimen_customer_id?: string
/** 奇门仓库编码(QM_WMS 必填) */
qimen_warehouse_code?: string
api_version?: string
contact_person?: string
contact_phone?: string
email?: string
is_enabled?: number
/**
* @deprecated 后端已忽略(含别名 callbackUrl):回调地址不再由入参维护,
* 保存时统一取 config.openapi.defaultCallbackUrl;前端不发送
*/
callback_url?: string
}) {
return request({

View File

@ -366,14 +366,13 @@ export type OrderExportColumnOption = {
}
/**
* order.export 全部可导出字段(共 57 个 = 接口文档枚举 55 个 + 「复核时间」+「拦截状态」):
* order.export 全部可导出字段(共 57 个,与接口文档枚举一致,2026-11-14):
* 仅 waybill 模式输出:系统订单号、外部订单号、平台单号、抓取波次号、商品明细、SN码汇总;
* 仅 item 模式输出:订单ID、订单号、外部单号、波次号、仓库商品名称、商品条码、商品图片、数量、SN码;
* 其余为两种模式通用(选了当前模式不存在的表头时后端会自动忽略该列)。
* ⚠️ 接口白名单**不含**「领料状态」「确认打印状态」(列表页仍有这两列,但导出不支持,传入非法表头会直接报错)。
* ⚠️ 「复核时间」(recheck_time) 刚由后端支持(2026-10-08),文档枚举暂未收录,勿以为多余而删除。
* ⚠️ 「拦截状态」(intercept_status) 由前端于 2026-11-02 按需求先加入(配送订单等列表页均有该列);
* 接口文档 55 项枚举尚未收录,需后端同步支持该表头,否则传入会按「非法表头」报错。
* ⚠️ **一旦传入 export_columns,服务端只输出白名单内的列**:新增列(如拦截状态、SN码数量、SN码、SN码汇总)
* 必须同步加入本清单,否则不会出现在导出表头中;不传该参数才会输出当前模式全部列。
* 「SN码数量」(字段 sn_quantity):订单明细中启用序列号管理(is_sn_mgmt='Y')商品的 plan_qty 合计;
* waybill 模式仅主单号行输出合计(子单号行为 0),item 模式按商品明细行输出(非 SN 商品行为 0)。
* 「SN码」(sn_codes, 仅 item):该商品行复核时登记的 SN 码列表(状态限定 BOUND/VERIFIED/REISSUED);
@ -1341,6 +1340,7 @@ export const isSnOrderFilterOptions = [
{ label: '否', value: 'N' },
]
/** 有无留言(buyer_message_has,虚拟字段):界面值 has/none,下发时由 buildOrderWhereConditions 转为布尔 true/false(文档要求) */
export const buyerMessageHasFilterOptions = [
{ label: '有留言', value: 'has' },
{ label: '无留言', value: 'none' },
@ -1571,6 +1571,19 @@ export const recheckTimeRangeScanField = scanBasicField({ label: '复核时间',
export const isUrgencyScanField = scanBasicField({ label: '是否紧急', value: 'is_urgency', type: 'select', options: isUrgencyFilterOptions })
/** ScanBox:含SN商品 → where.is_sn_order = Y/N(后端按订单分表 has_sn_item 归一化过滤;勿传 has_sn_item) */
export const snOrderScanField = scanBasicField({ label: '含SN商品', value: 'is_sn_order', type: 'select', options: isSnOrderFilterOptions })
/**
* ScanBox:按 SN 码反查订单(where.sn_code 虚拟字段)
* 后端先查 wms_order_item_sn 拿 order_id 再回填到订单条件;值支持单个码、
* 逗号/空格/分号分隔多个码、数组或 { value } 结构,按完整 SN 码精确匹配。
*/
export const snCodeScanField = scanBasicField({
label: 'SN码',
value: 'sn_code',
type: 'text',
placeholder: '完整 SN 码,多个用逗号/空格分隔',
operators: ORDER_BULK_SEARCH_OPERATORS,
defaultOperator: 'eq'
})
export const buyerMessageHasScanField = scanBasicField({ label: '有无留言', value: 'buyer_message_has', type: 'select', options: buyerMessageHasFilterOptions })
export const buyerMessageScanField = scanBasicField({ label: '留言', value: 'buyer_message', type: 'text', defaultOperator: 'like' })
/** 「包含商品」筛选项定义已迁至 @/utils/scanFields(此处仅转发) */
@ -1704,6 +1717,7 @@ export const deliveryAvailableFields = [
{ ...storeScanField, group: SCAN_QUICK_FILTER_GROUP },
{ ...isUrgencyScanField, group: SCAN_QUICK_FILTER_GROUP },
{ ...snOrderScanField, group: SCAN_QUICK_FILTER_GROUP },
{ ...snCodeScanField, group: SCAN_QUICK_FILTER_GROUP },
{ ...waveAssignmentScanField, group: SCAN_QUICK_FILTER_GROUP },
// 订单信息
{ ...pendingOrderQuickSearchScanField, group: SCAN_ORDER_INFO_GROUP },
@ -1929,6 +1943,7 @@ export const reviewAvailableFields = [
{ ...storeScanField, group: SCAN_QUICK_FILTER_GROUP },
{ ...isUrgencyScanField, group: SCAN_QUICK_FILTER_GROUP },
{ ...snOrderScanField, group: SCAN_QUICK_FILTER_GROUP },
{ ...snCodeScanField, group: SCAN_QUICK_FILTER_GROUP },
{ ...waveAssignmentScanField, group: SCAN_QUICK_FILTER_GROUP },
// 订单信息
{ ...orderQuickSearchScanField, label: '发货单号', group: SCAN_ORDER_INFO_GROUP },
@ -2101,6 +2116,7 @@ export const pendingAvailableFields = [
{ ...storeScanField, group: SCAN_QUICK_FILTER_GROUP },
{ ...isUrgencyScanField, group: SCAN_QUICK_FILTER_GROUP },
{ ...snOrderScanField, group: SCAN_QUICK_FILTER_GROUP },
{ ...snCodeScanField, group: SCAN_QUICK_FILTER_GROUP },
{ ...waveAssignmentScanField, group: SCAN_QUICK_FILTER_GROUP },
// 订单信息
{ ...pendingOrderQuickSearchScanField, group: SCAN_ORDER_INFO_GROUP },
@ -2504,6 +2520,7 @@ export const expectionOrderAvailableFields = [
{ ...storeScanField, group: SCAN_QUICK_FILTER_GROUP },
{ ...isUrgencyScanField, group: SCAN_QUICK_FILTER_GROUP },
{ ...snOrderScanField, group: SCAN_QUICK_FILTER_GROUP },
{ ...snCodeScanField, group: SCAN_QUICK_FILTER_GROUP },
{ ...waveAssignmentScanField, group: SCAN_QUICK_FILTER_GROUP },
// 订单信息
{ ...pendingOrderQuickSearchScanField, group: SCAN_ORDER_INFO_GROUP },
@ -2637,6 +2654,7 @@ export const archiveAvailableFields = [
{ ...storeScanField, group: SCAN_QUICK_FILTER_GROUP },
{ ...isUrgencyScanField, group: SCAN_QUICK_FILTER_GROUP },
{ ...snOrderScanField, group: SCAN_QUICK_FILTER_GROUP },
{ ...snCodeScanField, group: SCAN_QUICK_FILTER_GROUP },
{ ...waveAssignmentScanField, group: SCAN_QUICK_FILTER_GROUP },
// 订单信息
{ ...orderQuickSearchScanField, group: SCAN_ORDER_INFO_GROUP },

View File

@ -53,6 +53,7 @@
@page-change="handlePageChange"
@page-size-change="handlePageSizeChange"
@refresh="loadData"
@sort-change="handleSortChange"
@selection-change="onSelectionChange"
>
<template #column-is_urgency="{ row }">
@ -532,6 +533,27 @@ const platformCodeOptions = ref<Array<{ label: string; value: string }>>([])
const pagination = reactive({ currentPage: 1, pageSize: 20, total: 0 })
const tableSize = ref('small')
/** 列头排序状态(本页列为 sortable: 'custom');未选排序时回落默认 updated_at DESC */
const sortState = reactive<{ prop: string; order: 'ascending' | 'descending' | '' }>({ prop: '', order: '' })
function buildSortParams() {
if (!sortState.prop || !sortState.order) {
return { sortField: 'updated_at', sortOrder: 'DESC' as const }
}
return {
sortField: sortState.prop,
sortOrder: sortState.order === 'ascending' ? ('ASC' as const) : ('DESC' as const)
}
}
/** 列头排序变更:回到第 1 页并按所选列重查(导出复用同一排序) */
function handleSortChange({ prop, order }: { prop?: string | null; order?: string | null }) {
sortState.prop = String(prop || '')
sortState.order = order === 'ascending' || order === 'descending' ? order : ''
pagination.currentPage = 1
void loadData()
}
const columns = ref(buildPendingStyleColumns(expectionColumns))
const selectionRows = ref<any[]>([])
@ -740,10 +762,7 @@ async function loadData() {
pageSize: pagination.pageSize
},
where: buildExportWhere(),
sort: {
sortField: 'updated_at',
sortOrder: 'DESC' as const
}
sort: buildSortParams()
}
const res: any = await orderExpectionOrder.list(params)
if (res && (res.code === 200 || res.code === 1)) {
@ -772,10 +791,7 @@ function buildExportWhere() {
const pageExport = createOrderPageExport({
scopeKey: 'exceptionOrder',
buildWhere: buildExportWhere,
buildSort: () => ({
sortField: 'updated_at',
sortOrder: 'DESC'
}),
buildSort: buildSortParams,
selectionRows,
columns,
fileNamePrefix: '异常订单',

View File

@ -70,11 +70,20 @@
对每个订单执行前置检查(已分配储位、已分配快递、已同步且未被拦截),必要时自动完成拣货后标记发货;各订单独立事务,支持部分失败。
</p>
<!-- SN 订单不支持快捷复核(后端直接返回失败),提前提示改用单订单复核 -->
<p v-if="snOrderRows.length" class="task-panel__form-tip is-warning">
含 SN(序列号管理)商品的订单不支持批量发货:{{ snOrderLabels.join('、') }}{{ snOrderRows.length > snOrderLabels.length ? ` 等 ${snOrderRows.length} 单` : '' }}
,请改用单订单复核并提交 SN 码后再发货。
</p>
<div v-if="result" class="recheck-result">
<div class="result-summary">
<el-tag type="success" size="small">成功 {{ result.success_count }}</el-tag>
<el-tag type="danger" size="small">失败 {{ result.failed_count }}</el-tag>
</div>
<p v-if="snFailedCount" class="task-panel__form-tip is-warning">
有 {{ snFailedCount }} 单因含 SN(序列号管理)商品失败,请改用单订单复核并提交 SN 码后再发货。
</p>
<el-tabs v-model="resultTab" class="result-tabs">
<el-tab-pane :label="`成功 (${result.success.length})`" name="success">
<el-table :data="normalizeResultRows(result.success)" border size="small" max-height="220" empty-text="无">
@ -133,6 +142,8 @@ export type BatchQuickRecheckPreviewRow = {
delivery_order_code?: string
recheck_status?: string
pick_status?: string
/** 是否含 SN 商品:Y/N(响应原始列 has_sn_item,兼容归一化后的 is_sn_order) */
has_sn_item?: string
}
const visible = defineModel<boolean>({ default: false })
@ -154,6 +165,15 @@ const submitting = ref(false)
const result = ref<BatchQuickRecheckResponse | null>(null)
const resultTab = ref<'success' | 'failed'>('success')
/** 失败明细中命中 SN 相关文案的条数(后端对 SN 订单直接返回失败,需引导改用单订单复核) */
const snFailedCount = computed(() => {
const failed = result.value?.failed
if (!Array.isArray(failed)) return 0
return failed.filter((item: any) =>
/SN|序列号|sn_map|sn_code|has_sn_item/i.test(`${item?.reason ?? ''} ${item?.message ?? ''}`)
).length
})
const form = reactive({
idsText: ''
})
@ -166,6 +186,19 @@ const selectedRows = computed(() => props.selectedRows || [])
const parsedIds = computed(() => parseOrderIdsInput(form.idsText))
/** 已选订单中「含 SN 商品」的行:批量快捷复核不支持,需改用单订单复核 */
const snOrderRows = computed(() =>
selectedRows.value.filter((row) => String(row?.has_sn_item ?? '').trim().toUpperCase() === 'Y')
)
/** SN 订单提示文案(最多列 3 个发货单号) */
const snOrderLabels = computed(() =>
snOrderRows.value
.slice(0, 3)
.map((row) => String(row.delivery_order_code ?? row.id ?? '').trim())
.filter(Boolean)
)
/** 已选订单标签(发货单号) */
const selectedRowTagItems = computed(() =>
selectedRows.value
@ -337,8 +370,7 @@ async function handleSubmit() {
<style scoped lang="scss">
/* 状态文字颜色:与待处理订单「同步状态」同一套轻量样式(定义同 @/styles/status-text.scss) */
.ut-status-text {
font-size: 12px;
.ut-status-text { font-size: 12px;
line-height: 18px;
white-space: nowrap;
}
@ -483,6 +515,12 @@ async function handleSubmit() {
font-size: 12px;
line-height: 18px;
color: #909399;
/* SN 订单不支持批量发货的前置/结果提示 */
&.is-warning {
background: #fdf6ec;
color: #e6a23c;
}
}
&__foot {

View File

@ -58,6 +58,7 @@
@page-change="handlePageChange"
@page-size-change="handlePageSizeChange"
@refresh="loadData"
@sort-change="handleSortChange"
@selection-change="onSelectionChange"
>
@ -249,6 +250,27 @@ const queryTime = ref(0)
const availableFieldsRef = reactive(JSON.parse(JSON.stringify(outboundAvailableFields)))
const pagination = reactive({ currentPage: 1, pageSize: 20, total: 0 })
const tableSize = ref('small')
/** 列头排序状态(本页列为 sortable: 'custom');未选排序时回落默认 updated_at DESC */
const sortState = reactive<{ prop: string; order: 'ascending' | 'descending' | '' }>({ prop: '', order: '' })
function buildSortParams() {
if (!sortState.prop || !sortState.order) {
return { sortField: 'updated_at', sortOrder: 'DESC' as const }
}
return {
sortField: sortState.prop,
sortOrder: sortState.order === 'ascending' ? ('ASC' as const) : ('DESC' as const)
}
}
/** 列头排序变更:回到第 1 页并按所选列重查(导出复用同一排序) */
function handleSortChange({ prop, order }: { prop?: string | null; order?: string | null }) {
sortState.prop = String(prop || '')
sortState.order = order === 'ascending' || order === 'descending' ? order : ''
pagination.currentPage = 1
void loadData()
}
const columns = ref(buildPendingStyleColumns(outboundColumns))
const selectionRows = ref<any[]>([])
const selectedOrderId = ref<number | string | null>(null)
@ -299,10 +321,7 @@ function buildWhere() {
const pageExport = createOrderPageExport({
scopeKey: 'outboundOrder',
buildWhere,
buildSort: () => ({
sortField: 'updated_at',
sortOrder: 'DESC'
}),
buildSort: buildSortParams,
selectionRows,
columns,
fileNamePrefix: '待出库订单',
@ -342,10 +361,7 @@ async function loadData() {
pageSize: pagination.pageSize
},
where: buildWhere(),
sort: {
sortField: 'updated_at',
sortOrder: 'DESC' as const
}
sort: buildSortParams()
})
if (res && (res.code === 1 || res.code === 200)) {
const data = parseOrderListResponse(res)

View File

@ -55,6 +55,7 @@
@page-change="handlePageChange"
@page-size-change="handlePageSizeChange"
@refresh="loadData"
@sort-change="handleSortChange"
@selection-change="onSelectionChange"
>
<template #column-is_urgency="{ row }">
@ -531,6 +532,30 @@ const queryTime = ref(0)
const pagination = reactive({ currentPage: 1, pageSize: 20, total: 0 })
const tableSize = ref('small')
/**
* 列头排序状态(本页「订单ID/发货单号/商品数/时间」等列为 sortable: 'custom')。
* 未选排序时回落默认 updated_at DESC。
*/
const sortState = reactive<{ prop: string; order: 'ascending' | 'descending' | '' }>({ prop: '', order: '' })
function buildSortParams() {
if (!sortState.prop || !sortState.order) {
return { sortField: 'updated_at', sortOrder: 'DESC' as const }
}
return {
sortField: sortState.prop,
sortOrder: sortState.order === 'ascending' ? ('ASC' as const) : ('DESC' as const)
}
}
/** 列头排序变更:回到第 1 页并按所选列重查(导出复用同一排序) */
function handleSortChange({ prop, order }: { prop?: string | null; order?: string | null }) {
sortState.prop = String(prop || '')
sortState.order = order === 'ascending' || order === 'descending' ? order : ''
pagination.currentPage = 1
void loadData()
}
const columns = ref(buildPendingStyleColumns())
const selectionRows = ref<any[]>([])
@ -709,10 +734,7 @@ async function loadData() {
pageSize: pagination.pageSize
},
where: buildExportWhere(),
sort: {
sortField: 'updated_at',
sortOrder: 'DESC' as const
}
sort: buildSortParams()
}
try {
@ -751,10 +773,7 @@ function buildExportWhere() {
const pageExport = createOrderPageExport({
scopeKey: 'pendingOrder',
buildWhere: buildExportWhere,
buildSort: () => ({
sortField: 'updated_at',
sortOrder: 'DESC'
}),
buildSort: buildSortParams,
selectionRows,
columns,
fileNamePrefix: '待处理订单',

View File

@ -422,6 +422,16 @@ export function buildOrderWhereConditions(rawConditions: Record<string, any>) {
const value = Array.isArray(rawValue) && rawValue.length === 1 ? rawValue[0] : rawValue
where.wave_scope = { operator: 'eq', value }
}
// 买家留言 buyer_message_has:文档要求 value 为布尔(true=有留言 / false=无),
// 兼容历史缓存/预设里的 has / none 写法,统一在此转换
if (where.buyer_message_has && typeof where.buyer_message_has === 'object' && 'value' in where.buyer_message_has) {
const rawValue = (where.buyer_message_has as { value: unknown }).value
const text = String(rawValue ?? '').trim().toLowerCase()
let value: unknown = rawValue
if (['has', 'true', '1', 'y', 'yes'].includes(text)) value = true
else if (['none', 'false', '0', 'n', 'no'].includes(text)) value = false
where.buyer_message_has = { operator: 'eq', value }
}
return where
}

View File

@ -1090,7 +1090,9 @@ export function createPendingToolbarController(params: {
id: row?.id ?? row?.order_id,
delivery_order_code: row?.delivery_order_code,
recheck_status: row?.recheck_status,
pick_status: row?.pick_status
pick_status: row?.pick_status,
/** 含 SN 商品标记:批量快捷复核不支持 SN 订单(需单订单复核并提交 SN 码),用于弹窗前置提示 */
has_sn_item: row?.has_sn_item ?? row?.is_sn_order
}))
batchQuickRecheckDialogVisible.value = true
}

View File

@ -709,14 +709,14 @@ async function submitFallbackOrderFetchByIds() {
Number.isFinite(fetched) && fetched >= 0 ? `已抓取 ${fetched} 单` : ''
]
const excluded = payload?.excluded_existing_wave_order_ids
const excludedLocked = payload?.excluded_locked_order_ids
const skipped = payload?.skipped_order_ids
const notFound = payload?.not_found_order_ids
const excludedSn = payload?.excluded_sn_order_ids
if (Array.isArray(excluded) && excluded.length) {
parts.push(`已在波次中跳过 ${excluded.length} 单`)
}
if (Array.isArray(excludedSn) && excludedSn.length) {
parts.push(`SN 订单不支持散单抓取,已跳过 ${excludedSn.length} 单`)
if (Array.isArray(excludedLocked) && excludedLocked.length) {
parts.push(`已锁定跳过 ${excludedLocked.length} 单`)
}
if (Array.isArray(skipped) && skipped.length) {
parts.push(`跳过 ${skipped.length} 单`)

View File

@ -355,7 +355,11 @@
刷新统计
</el-button>
</div>
<el-checkbox v-model="groupOrderFilters.returnOrderIds">返回订单 ID 列表</el-checkbox>
<!-- return_order_ids:勾选后接口额外返回组内订单 ID(order_ids),下方会多出「订单ID」列 -->
<el-checkbox
v-model="groupOrderFilters.returnOrderIds"
@change="handleGroupOrderFilterChange"
>返回订单 ID 列表</el-checkbox>
</div>
<div class="group-order-table-host">
@ -363,7 +367,7 @@
ref="groupOrderTableRef"
:data="groupOrderList"
:loading="groupOrderListLoading"
:columns="waveGroupOrderColumns"
:columns="groupOrderColumns"
:row-key="groupOrderRowKey"
show-selection
table-size="small"
@ -935,6 +939,8 @@ import {
waveGroupOrderColumns,
waveWhereAllowedFields,
waveWhereTextOperatorFields,
sortRowsByColumn,
formatWaveOperationDetails,
getWaveToolbarButtons,
waveStrategyFormRules,
waveStrategyStatusOptions,
@ -1388,6 +1394,36 @@ const groupOrderFilters = reactive({
includeSku: '',
returnOrderIds: false
})
/**
* 抓取团购单弹窗的表格列。
* order.wave.groupOrderFetchList 仅在 return_order_ids=true 时返回 order_ids,
* 因此勾选「返回订单 ID 列表」时才追加「订单ID」列,否则保持默认列。
*/
const groupOrderColumns = computed(() => {
if (!groupOrderFilters.returnOrderIds) return waveGroupOrderColumns
return [
...waveGroupOrderColumns,
{
prop: 'order_ids',
label: '订单ID',
minWidth: 200,
// 多个订单 ID 时按 UpperTable 的多值折叠展示(首个 + 「+N」),点击可复制
copyAction: 'copy' as const,
copyValue: (row: any) => normalizeGroupOrderIds(row?.order_ids)
}
]
})
/** 组内订单 ID 归一化为字符串数组(接口按 return_order_ids=true 才返回 order_ids) */
function normalizeGroupOrderIds(value: unknown): string[] {
if (Array.isArray(value)) {
return value.map((item) => String(item ?? '').trim()).filter(Boolean)
}
const text = String(value ?? '').trim()
return text ? [text] : []
}
const isGroupWaveTab = computed(() => WAVE_TYPE === 1)
const currentWaveType = computed(() => WAVE_TYPE)
const tableListId = computed(() => `wave-management-list-${WAVE_TYPE}`)
@ -1551,7 +1587,7 @@ async function loadData() {
pageSize: pagination.pageSize
})
list.value = responseList
list.value = sortRowsByColumn(responseList, currentSort.prop, currentSort.order)
pagination.currentPage = responsePagination.page || pagination.currentPage
pagination.pageSize = responsePagination.pageSize || pagination.pageSize
pagination.total = responsePagination.total || 0
@ -1823,11 +1859,28 @@ async function handleBatchAutoGrouping() {
batchAutoGroupingLoading.value = true
try {
const res = await orderWaveBatchAutoGrouping({ ids }) as WaveBatchAutoGroupingResponse & { code?: number; message?: string }
const res = await orderWaveBatchAutoGrouping({ ids }) as WaveBatchAutoGroupingResponse & {
code?: number
message?: string
data?: Partial<WaveBatchAutoGroupingResponse>
}
if (!res || !okCode(res.code)) {
throw new Error(res?.message || '批量修改自动加团状态失败')
}
ElMessage.success(res?.message || '批量修改为自动加团成功')
const payload = (
res.data && typeof res.data === 'object' && !Array.isArray(res.data) ? res.data : res
) as WaveBatchAutoGroupingResponse
const updatedCount = Number(payload?.updated_wave_count ?? 0)
const skippedCount =
Number(payload?.skipped_wave_count ?? 0) ||
(Array.isArray(payload?.skipped_wave_ids) ? payload.skipped_wave_ids.length : 0)
const skippedDetail = formatWaveOperationDetails(payload?.skipped_details, { idPrefix: '波次' })
ElMessage.success(
res?.message || `批量修改为自动加团成功${updatedCount > 0 ? `(更新 ${updatedCount} 个波次)` : ''}`
)
if (skippedCount > 0) {
ElMessage.warning(`已跳过 ${skippedCount} 个波次${skippedDetail ? `:${skippedDetail}` : '(不满足自动加团条件)'}`)
}
selectionRows.value = []
hasSelection.value = false
await loadData()
@ -1863,11 +1916,26 @@ async function handleBatchFinishAutoGrouping() {
batchFinishAutoGroupingLoading.value = true
try {
const res = await orderWaveBatchFinishAutoGrouping({ ids }) as WaveBatchFinishAutoGroupingResponse & { code?: number; message?: string }
const res = await orderWaveBatchFinishAutoGrouping({ ids }) as WaveBatchFinishAutoGroupingResponse & {
code?: number
message?: string
data?: Partial<WaveBatchFinishAutoGroupingResponse>
}
if (!res || !okCode(res.code)) {
throw new Error(res?.message || '批量结束自动加团失败')
}
ElMessage.success(res?.message || '批量结束自动加团成功')
const payload = (
res.data && typeof res.data === 'object' && !Array.isArray(res.data) ? res.data : res
) as WaveBatchFinishAutoGroupingResponse
const totalCount = Array.isArray(payload?.ids) && payload.ids.length ? payload.ids.length : ids.length
const updatedCount = Number(payload?.updated_wave_count ?? 0)
const skippedCount = Math.max(0, totalCount - updatedCount)
ElMessage.success(
res?.message || `批量结束自动加团成功${updatedCount > 0 ? `(更新 ${updatedCount} 个波次)` : ''}`
)
if (payload?.updated_wave_count !== undefined && payload?.updated_wave_count !== null && skippedCount > 0) {
ElMessage.warning(`有 ${skippedCount} 个波次未处于自动加团中,已跳过`)
}
selectionRows.value = []
hasSelection.value = false
await loadData()
@ -3040,7 +3108,10 @@ async function handleBatchQuickRecheckByWave() {
const successCount = data.success_count || 0
const failedCount = data.failed_count || 0
if (failedCount > 0) {
ElMessage.warning(`批量发货完成:成功 ${successCount} 个,失败 ${failedCount} 个`)
const failedDetail = formatWaveOperationDetails(data.failed)
ElMessage.warning(
`批量发货完成:成功 ${successCount} 个,失败 ${failedCount} 个${failedDetail ? `;${failedDetail}` : ''}`
)
} else {
ElMessage.success(`批量发货完成:成功 ${successCount} 个`)
}

View File

@ -516,6 +516,8 @@ import {
waveBatchColumns,
waveWhereAllowedFields,
waveWhereTextOperatorFields,
sortRowsByColumn,
formatWaveOperationDetails,
getWaveToolbarButtons,
waveStatusTextMap,
waveTypeTextMap,
@ -953,7 +955,7 @@ async function loadData() {
pageSize: pagination.pageSize
})
list.value = responseList
list.value = sortRowsByColumn(responseList, currentSort.prop, currentSort.order)
pagination.currentPage = responsePagination.page || pagination.currentPage
pagination.pageSize = responsePagination.pageSize || pagination.pageSize
pagination.total = responsePagination.total || 0
@ -1225,11 +1227,28 @@ async function handleBatchAutoGrouping() {
batchAutoGroupingLoading.value = true
try {
const res = await orderWaveBatchAutoGrouping({ ids }) as WaveBatchAutoGroupingResponse & { code?: number; message?: string }
const res = await orderWaveBatchAutoGrouping({ ids }) as WaveBatchAutoGroupingResponse & {
code?: number
message?: string
data?: Partial<WaveBatchAutoGroupingResponse>
}
if (!res || !okCode(res.code)) {
throw new Error(res?.message || '批量修改自动加团状态失败')
}
ElMessage.success(res?.message || '批量修改为自动加团成功')
const payload = (
res.data && typeof res.data === 'object' && !Array.isArray(res.data) ? res.data : res
) as WaveBatchAutoGroupingResponse
const updatedCount = Number(payload?.updated_wave_count ?? 0)
const skippedCount =
Number(payload?.skipped_wave_count ?? 0) ||
(Array.isArray(payload?.skipped_wave_ids) ? payload.skipped_wave_ids.length : 0)
const skippedDetail = formatWaveOperationDetails(payload?.skipped_details, { idPrefix: '波次' })
ElMessage.success(
res?.message || `批量修改为自动加团成功${updatedCount > 0 ? `(更新 ${updatedCount} 个波次)` : ''}`
)
if (skippedCount > 0) {
ElMessage.warning(`已跳过 ${skippedCount} 个波次${skippedDetail ? `:${skippedDetail}` : '(不满足自动加团条件)'}`)
}
selectionRows.value = []
hasSelection.value = false
await loadData()
@ -1265,11 +1284,26 @@ async function handleBatchFinishAutoGrouping() {
batchFinishAutoGroupingLoading.value = true
try {
const res = await orderWaveBatchFinishAutoGrouping({ ids }) as WaveBatchFinishAutoGroupingResponse & { code?: number; message?: string }
const res = await orderWaveBatchFinishAutoGrouping({ ids }) as WaveBatchFinishAutoGroupingResponse & {
code?: number
message?: string
data?: Partial<WaveBatchFinishAutoGroupingResponse>
}
if (!res || !okCode(res.code)) {
throw new Error(res?.message || '批量结束自动加团失败')
}
ElMessage.success(res?.message || '批量结束自动加团成功')
const payload = (
res.data && typeof res.data === 'object' && !Array.isArray(res.data) ? res.data : res
) as WaveBatchFinishAutoGroupingResponse
const totalCount = Array.isArray(payload?.ids) && payload.ids.length ? payload.ids.length : ids.length
const updatedCount = Number(payload?.updated_wave_count ?? 0)
const skippedCount = Math.max(0, totalCount - updatedCount)
ElMessage.success(
res?.message || `批量结束自动加团成功${updatedCount > 0 ? `(更新 ${updatedCount} 个波次)` : ''}`
)
if (payload?.updated_wave_count !== undefined && payload?.updated_wave_count !== null && skippedCount > 0) {
ElMessage.warning(`有 ${skippedCount} 个波次未处于自动加团中,已跳过`)
}
selectionRows.value = []
hasSelection.value = false
await loadData()
@ -2487,7 +2521,10 @@ async function handleBatchQuickRecheckByWave() {
const successCount = data.success_count || 0
const failedCount = data.failed_count || 0
if (failedCount > 0) {
ElMessage.warning(`批量发货完成:成功 ${successCount} 个,失败 ${failedCount} 个`)
const failedDetail = formatWaveOperationDetails(data.failed)
ElMessage.warning(
`批量发货完成:成功 ${successCount} 个,失败 ${failedCount} 个${failedDetail ? `;${failedDetail}` : ''}`
)
} else {
ElMessage.success(`批量发货完成:成功 ${successCount} 个`)
}

View File

@ -303,7 +303,8 @@ import {
formatPickTaskSource,
getPickTaskStatusTagType,
getPickTaskReviewStatusTagType,
getPickTaskSourceTagType
getPickTaskSourceTagType,
sortRowsByColumn
} from './config/wave-config'
const props = withDefaults(
@ -1012,7 +1013,11 @@ async function loadData() {
page_size: pagination.pageSize
})
list.value = responseList.map((item) => normalizePickTaskRow(item))
list.value = sortRowsByColumn(
responseList.map((item) => normalizePickTaskRow(item)),
currentSort.prop,
currentSort.order
)
selectedTaskRows.value = []
pagination.total = total
pagination.currentPage = page

View File

@ -47,11 +47,11 @@
:enable-column-config="true"
:column-config-schema-version="3"
:table-id="tableListId"
:data="filteredColumns"
:data="tableData"
:row-key="getRowIdentity"
:columns="visibleColumns"
:table-size="tableSize"
:pagination="pagination"
:pagination="tablePagination"
:show-index="true"
:show-selection="true"
:loading="loading"
@ -560,6 +560,7 @@ import {
buildWaveStrategyMutationPayload,
waveBooleanOptions,
waveStrategyToolbarButtons,
sortRowsByColumn,
WAVE_STRATEGY_TYPE_SN
} from './config/wave-config'
import { safeInvoke } from '@/utils/safe-invoke'
@ -594,6 +595,16 @@ const loading = ref(false)
const queryTime = ref(0)
const tableSize = ref('small')
const list = ref<any[]>([])
/**
* 接口仅支持 where.strategy_type,策略名称 / 波次前缀 / 启用状态 / 批次模式只能前端过滤。
* 为避免「筛选只作用于当前页」,命中这些条件时一次取回前 N 条并在前端分页。
*/
const STRATEGY_LOCAL_FILTER_FIELDS = ['strategy_name', 'status', 'batch_mode', 'wave_prefix']
const STRATEGY_LOCAL_FILTER_FETCH_SIZE = 1000
/** 最近一次请求生效的筛选条件(ScanBox 条件不是响应式数据,统一在 loadData 时快照) */
const activeFilterWhere = ref<Record<string, any>>({})
/** 当前是否命中「仅前端可过滤」的条件 */
const localFilterActive = ref(false)
const pagination = reactive({ currentPage: 1, pageSize: 20, total: 0 })
const currentSort = reactive({ prop: '', order: '' })
@ -650,11 +661,27 @@ const visibleColumns = computed(() => {
})
const filteredColumns = computed(() => {
const conditions = scanBox.value?.getConditions?.() || {}
const where = buildWhereConditions(conditions)
return list.value.filter((row: any) => matchWaveStrategy(row, where))
const where = activeFilterWhere.value
const rows = localFilterActive.value
? list.value.filter((row: any) => matchWaveStrategy(row, where))
: list.value
return sortRowsByColumn(rows, currentSort.prop, currentSort.order)
})
/** 表格数据:本地筛选时改由前端分页,否则直接用服务端当前页数据 */
const tableData = computed(() => {
if (!localFilterActive.value) return filteredColumns.value
const start = (pagination.currentPage - 1) * pagination.pageSize
return filteredColumns.value.slice(start, start + pagination.pageSize)
})
/** 分页信息:本地筛选时总数取过滤后的条数,避免与服务端总数不一致 */
const tablePagination = computed(() => ({
currentPage: pagination.currentPage,
pageSize: pagination.pageSize,
total: localFilterActive.value ? filteredColumns.value.length : pagination.total
}))
const toolbarButtons = waveStrategyToolbarButtons
const waveStrategyActiveFormRules = computed(() => {
@ -798,8 +825,18 @@ function buildWaveStrategyListApiParams(): WaveStrategyListParams {
async function loadData() {
loading.value = true
const start = Date.now()
// ScanBox 条件不是响应式数据:先快照,再决定是否本地筛选
const rawWhere = buildWhereConditions(scanBox.value?.getConditions?.() || {})
const useLocalFilter = STRATEGY_LOCAL_FILTER_FIELDS.some((field) => rawWhere[field] !== undefined)
activeFilterWhere.value = rawWhere
localFilterActive.value = useLocalFilter
try {
const res = await orderWaveWaveStrategyList(buildWaveStrategyListApiParams()) as WaveStrategyListResponse & { code?: number; message?: string; data?: Partial<WaveStrategyListResponse> }
const params = buildWaveStrategyListApiParams()
if (useLocalFilter) {
// 本地筛选需要跨页数据:一次性取回,前端分页
params.pagination = { page: 1, pageSize: Math.max(STRATEGY_LOCAL_FILTER_FETCH_SIZE, pagination.pageSize) }
}
const res = await orderWaveWaveStrategyList(params) as WaveStrategyListResponse & { code?: number; message?: string; data?: Partial<WaveStrategyListResponse> }
if (!res || !okCode(res.code)) {
throw new Error(res?.message || '获取波次策略列表失败')
}
@ -810,9 +847,17 @@ async function loadData() {
: []
const responsePagination = res.pagination || res.data?.pagination || {}
list.value = responseList
pagination.currentPage = responsePagination.page || pagination.currentPage
pagination.pageSize = responsePagination.pageSize || pagination.pageSize
pagination.total = responsePagination.total || 0
if (useLocalFilter) {
pagination.currentPage = 1
pagination.total = Number(responsePagination.total || 0) || responseList.length
if (pagination.total > responseList.length) {
ElMessage.warning('策略数量超出单次加载上限,本地筛选结果可能不完整')
}
} else {
pagination.currentPage = responsePagination.page || pagination.currentPage
pagination.pageSize = responsePagination.pageSize || pagination.pageSize
pagination.total = responsePagination.total || 0
}
refreshWaveStrategyProvinceOptions()
} catch (error: any) {
console.error('fetch wave strategy list failed:', error)
@ -828,6 +873,8 @@ async function loadData() {
function handlePageChange(page: number) {
pagination.currentPage = page
// 本地筛选时由前端分页,无需重新请求
if (localFilterActive.value) return
void loadData()
}
@ -835,21 +882,22 @@ function handleSortChange({ prop, order }: any) {
currentSort.prop = prop
currentSort.order = order
pagination.currentPage = 1
// 本地筛选时排序已在前端完成(filteredColumns)
if (localFilterActive.value) return
void loadData()
}
function handlePageSizeChange(size: number) {
pagination.pageSize = size
pagination.currentPage = 1
if (localFilterActive.value) return
void loadData()
}
function handleConditionChange() {
const rawWhere = buildWhereConditions(scanBox.value?.getConditions?.() || {})
if (rawWhere.strategy_type !== undefined) {
pagination.currentPage = 1
void loadData()
}
// 策略名称/波次前缀/状态/批次模式 需要重新拉取全量数据才能跨页过滤,故统一重新查询
pagination.currentPage = 1
void loadData()
}
function handleConditionClear() {

View File

@ -314,6 +314,106 @@ export function applyWaveListCopyActions<
})
}
/**
* 列表本地排序兜底。
* order.wave.batchList / wavePickTaskList / waveStrategyList 的接口文档未声明 sort 参数,
* 为避免「点了排序箭头数据不变」,仍照常下发 sort,同时对当前页数据本地再排一次:
* 后端支持时为幂等操作,后端忽略时也能让当前页顺序与箭头一致。
* 数值列按数值比较,其余按字符串比较;空值恒排末尾。
*/
export function sortRowsByColumn<T extends Record<string, any>>(
rows: T[],
prop: string | null | undefined,
order: string | null | undefined
): T[] {
const direction = String(order || '').toLowerCase()
const sign = direction === 'ascending' || direction === 'asc' ? 1 : direction === 'descending' || direction === 'desc' ? -1 : 0
if (!prop || !sign || !Array.isArray(rows) || rows.length <= 1) return rows
const toComparable = (value: unknown): number | string | null => {
if (value === null || value === undefined) return null
if (typeof value === 'number') return Number.isFinite(value) ? value : null
const text = String(value).trim()
if (!text) return null
const num = Number(text)
return Number.isFinite(num) ? num : text
}
return [...rows].sort((a, b) => {
const av = toComparable(a?.[prop])
const bv = toComparable(b?.[prop])
if (av === null && bv === null) return 0
if (av === null) return 1
if (bv === null) return -1
if (typeof av === 'number' && typeof bv === 'number') return (av - bv) * sign
return String(av).localeCompare(String(bv)) * sign
})
}
/** 波次列表时间列格式化:兼容时间戳(秒/毫秒)与字符串,空值返回 — */
export function formatWaveDateTime(value: unknown): string {
if (value === null || value === undefined) return '—'
const text = String(value).trim()
if (!text) return '—'
let normalized: string | number = text
if (/^\d+$/.test(text)) {
const numeric = Number(text)
normalized = text.length <= 10 ? numeric * 1000 : numeric
}
const date = new Date(normalized)
if (Number.isNaN(date.getTime())) return text
const pad = (n: number) => String(n).padStart(2, '0')
return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`
}
/** 批量改自动加团 skipped_details.reason 枚举 → 中文 */
const WAVE_BATCH_SKIP_REASON_TEXT: Record<string, string> = {
printed_or_after_printed: '已打印或已进入后续流程',
reach_max_wave_quantity: '已达单波最大订单数'
}
/**
* 批量操作明细文案。
* 用于 batchAutoGrouping.skipped_details、batchQuickRecheckByWave.failed 等(文档未固定元素字段,做多种兼容)。
*/
export function formatWaveOperationDetails(
list: unknown,
options: { limit?: number; idPrefix?: string } = {}
): string {
if (!Array.isArray(list) || !list.length) return ''
const limit = Math.max(1, options.limit ?? 3)
const idPrefix = options.idPrefix ?? ''
const pickText = (item: any, keys: string[]) => {
for (const key of keys) {
const value = item?.[key]
if (value !== undefined && value !== null && String(value).trim() !== '') return String(value).trim()
}
return ''
}
const labels = list
.slice(0, limit)
.map((item: any) => {
if (item === null || item === undefined) return ''
if (typeof item !== 'object') return String(item)
const rawReason = pickText(item, ['reason', 'message', 'error_message', 'error', 'msg', 'tip'])
const reason = WAVE_BATCH_SKIP_REASON_TEXT[rawReason] ?? rawReason
const id = pickText(item, [
'wave_no',
'wave_id',
'delivery_no',
'delivery_order_code',
'order_sn',
'order_code',
'order_id',
'id'
])
return [id ? `${idPrefix}${id}` : '', reason].filter(Boolean).join(':')
})
.filter(Boolean)
if (!labels.length) return ''
return list.length > limit ? `${labels.join(';')};等共 ${list.length} 条` : labels.join(';')
}
export function getPickTaskWaveNos(row: any): string[] {
if (!Array.isArray(row?.wave_list) || !row.wave_list.length) return []
return row.wave_list
@ -430,6 +530,13 @@ export const waveBatchColumns = applyWaveListCopyActions([
{ prop: 'print_assignment_status', label: '打印状态', minWidth: 110 },
{ prop: 'confirm_print_assignment_status', label: '确认打印状态', minWidth: 120 },
{ prop: 'claim_assignment_status', label: '领料状态', minWidth: 110 },
{ prop: 'claim_operator', label: '领料人', minWidth: 110 },
{
prop: 'claim_time',
label: '领料时间',
minWidth: 168,
formatter: (_row: any, _column: any, value: unknown) => formatWaveDateTime(value)
},
{ prop: 'pick_assignment_status', label: '拣货状态', minWidth: 110 },
{ prop: 'review_assignment_status', label: '复核状态', minWidth: 110 },
{ prop: 'sync_assignment_status', label: '同步状态', minWidth: 110 },

View File

@ -27,7 +27,7 @@
/>
</div>
<div class="toolbar-right">
<span v-if="selectedRows.length" class="selection-summary">已选 {{ selectedRows.length }} 项</span>
<!-- <span v-if="selectedRows.length" class="selection-summary">已选 {{ selectedRows.length }} 项</span> -->
</div>
</div>

View File

@ -8,6 +8,11 @@
<el-button size="small" type="primary" plain @click="quantityVisible = !quantityVisible">
{{ quantityVisible ? '隐藏数量' : '显示数量' }}
</el-button>
<!-- 明细粒度:按批次 = 每条库存明细(默认);按库位合并 = 同一库位合并展示 -->
<el-radio-group v-model="groupByBatch" size="small" @change="handleGroupByBatchChange">
<el-radio-button :value="true">按批次</el-radio-button>
<el-radio-button :value="false">按库位合并</el-radio-button>
</el-radio-group>
</div>
<div class="right-actions">
@ -165,6 +170,23 @@ const pagination = reactive({
total: 0
})
/**
* 明细粒度(对应接口 group_by_batch):
* true = 按批次返回每条明细(默认,页面展示批次/供应商批次列);
* false = 后端按库位合并返回
*/
const groupByBatch = ref(true)
function handleGroupByBatchChange() {
pagination.currentPage = 1
selectedRows.value = []
nextTick(() => {
tableRef.value?.clearSelection?.()
tableRef.value?.getTableRef?.()?.setScrollTop?.(0)
})
loadData()
}
async function loadData() {
if (!props.id) {
tableData.value = []
@ -176,7 +198,8 @@ async function loadData() {
try {
const res = await stockApi.getStockDetail(Number(props.id), {
page: pagination.currentPage,
pageSize: pagination.pageSize
pageSize: pagination.pageSize,
group_by_batch: groupByBatch.value
})
if (res && res.data) {
tableData.value = res.data.storageList || []

View File

@ -45,6 +45,7 @@
<el-dropdown-item command="pick_requirements">拣货要求</el-dropdown-item>
<el-dropdown-item command="recheck_requirements">复核要求</el-dropdown-item>
<el-dropdown-item command="merge_requirements">是否合并</el-dropdown-item>
<el-dropdown-item command="need_recheck">是否复核</el-dropdown-item>
<el-dropdown-item command="managementFlags">管理标识</el-dropdown-item>
</el-dropdown-menu>
</template>
@ -385,10 +386,23 @@ const {
queryProgress: (params) => stockApi.getExportTaskProgress(params)
})
function buildExportPayload() {
/** 列表与导出共用的排序参数:跟随表头当前排序,未排序时不传 */
function buildListSort(): StockWarehouseListSort | undefined {
if (!currentSort.prop) return undefined
return {
sortField: currentSort.prop,
sortOrder: currentSort.order === 'ascending' ? 'ASC' : 'DESC'
}
}
function buildExportPayload() {
const sort = buildListSort()
const payload: { where: Record<string, any>; sort?: StockWarehouseListSort } = {
where: buildStockQuery(currentConditions.value)
}
// 导出接口支持 sort,跟随列表当前排序保持导出顺序一致
if (sort) payload.sort = sort
return payload
}
function buildExportSelectedPayload() {
@ -582,14 +596,7 @@ const loadData = async () => {
// 调试用:前端打印查看转换结果,确认 operator/value/type 是否符合预期
// console.log('Query Params:', JSON.stringify(params, null, 2))
const sort: StockWarehouseListSort | undefined = currentSort.prop
? {
sortField: currentSort.prop,
sortOrder: currentSort.order === 'ascending' ? 'ASC' : 'DESC'
}
: undefined
const res = await stockApi.stockWarehouse(pagination, params, sort)
const res = await stockApi.stockWarehouse(pagination, params, buildListSort())
if (res && res.data) {
list.value = res.data.list
if (res.data.pagination) {

View File

@ -525,6 +525,16 @@ export const stockBatchConfig = {
{ label: '拆分', value: 'N' }
]
},
need_recheck: {
// 后端 handleBatchChange 白名单字段:'Y'=需要复核,'N'=跳过复核(其他值会报错)
title: '是否复核',
placeholder: '请选择是否需要复核',
type: 'select',
options: [
{ label: '需要复核', value: 'Y' },
{ label: '跳过复核', value: 'N' }
]
},
managementFlags: {
title: '管理标识',
type: 'checkbox',

View File

@ -758,13 +758,13 @@
style="width:100%"
>
<el-option
v-for="t in qimenDialog.availableTypes"
v-for="t in selectableTypes"
:key="t.interface_code"
:label="`${t.interface_name}(${t.interface_code})`"
:value="t.interface_code"
/>
<el-option
v-if="qimenForm.interface_code && !qimenDialog.availableTypes.some(t => t.interface_code === qimenForm.interface_code)"
v-if="qimenForm.interface_code && !selectableTypes.some(t => t.interface_code === qimenForm.interface_code)"
:label="`${qimenDialog.editingConfig?.interface_name || qimenForm.interface_code}(${qimenForm.interface_code})`"
:value="qimenForm.interface_code"
/>
@ -846,27 +846,15 @@
</el-input>
</el-form-item>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">API 版本</span>
<el-form-item>
<el-input v-model="qimenForm.api_version" placeholder="默认 1.0" />
</el-form-item>
</div>
</template>
<!-- OPEN_API:回调地址 -->
<!-- OPEN_API:回调地址已不由入参维护(后端统一取 config.openapi.defaultCallbackUrl) -->
<template v-else-if="qimenForm.interface_code === 'OPEN_API'">
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">回调地址</span>
<el-form-item>
<div class="callback-url-row">
<el-input
v-model="qimenForm.callback_url"
placeholder="API 回调通知 URL(可选),订单状态变更时将推送至此地址"
maxlength="500"
show-word-limit
style="flex:1"
/>
<strong class="task-panel__field-value is-muted">由系统统一配置,无需填写</strong>
<el-button size="small" type="primary" link @click="openCallbackDoc">
<el-icon><Link /></el-icon> 调试文档
</el-button>
@ -912,55 +900,19 @@
<el-input v-model="qimenForm.qimen_warehouse_code" placeholder="奇门仓库编码(如适用)" />
</el-form-item>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">API 版本</span>
<el-form-item>
<el-input v-model="qimenForm.api_version" placeholder="默认 1.0" />
</el-form-item>
</div>
</template>
<!-- 联系信息 -->
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">联系人</span>
<el-form-item>
<el-input v-model="qimenForm.contact_person" placeholder="可选" />
</el-form-item>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">联系电话</span>
<el-form-item>
<el-input v-model="qimenForm.contact_phone" placeholder="可选" />
</el-form-item>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">邮箱</span>
<el-form-item>
<el-input v-model="qimenForm.email" placeholder="可选" />
</el-form-item>
</div>
<!-- 启用状态 -->
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">是否启用</span>
<el-form-item>
<el-switch
v-model="qimenForm.is_enabled"
:active-value="1"
:inactive-value="0"
active-text="启用"
inactive-text="停用"
/>
</el-form-item>
</div>
</el-form>
</div>
<p class="task-panel__form-tip">
保存后立即生效;启用状态将影响该签约货主的接口调用。
保存后立即生效。
</p>
<p v-if="qimenForm.interface_code === 'OPEN_API'" class="task-panel__form-tip">
OPEN_API 类型无需填写奇门字段,系统将自动生成 AppKey 与 AppSecret。
OPEN_API 类型无需填写奇门字段,系统将自动生成 AppKey 与 AppSecret;回调地址由系统统一配置,此处无需填写。
</p>
<p v-if="qimenForm.interface_code === OMS_INTERFACE_TYPE.interface_code" class="task-panel__form-tip">
{{ OMS_INTERFACE_TYPE.interface_name }} 签约关系级配置按货主开放接口落库(interface_type_id 由 3 自动映射为 2),仅需填写应用名称。
</p>
</div>
@ -1549,7 +1501,7 @@ import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
import { useAsyncExportTask } from '@/composables/useAsyncExportTask'
import AsyncExportProgressDialog from '@/components/AsyncExportProgressDialog.vue'
import { safeInvoke } from '@/utils/safe-invoke'
import { columns as defaultColumns, availableFields as defaultAvailableFields, presetTree as defaultPresetTree, qimenFormDefault, qimenFormItems, qimenTableColumns, adjustBalanceDialogDefault, adjustBalanceFormDefault, adjustBalanceFormItems, openAccountDialogDefault, openAccountFormDefault, createUserDialogDefault, createUserFormDefault, storeToolbarButtons } from './store-config.ts'
import { columns as defaultColumns, availableFields as defaultAvailableFields, presetTree as defaultPresetTree, qimenFormDefault, qimenFormItems, qimenTableColumns, adjustBalanceDialogDefault, adjustBalanceFormDefault, adjustBalanceFormItems, openAccountDialogDefault, openAccountFormDefault, createUserDialogDefault, createUserFormDefault, storeToolbarButtons, OMS_INTERFACE_TYPE } from './store-config.ts'
import { inboxBindCode } from '@/api/inbox/inbox'
// ─── 列表 ───────────────────────────────────────────────────────────────────
@ -2481,8 +2433,15 @@ const qimenDialog = reactive({
})
const qimenAppOptions = ref<Array<{ label: string; value: string }>>([])
/** 新增时可选的接口类型 */
const selectableTypes = computed(() => qimenDialog.availableTypes)
/**
* 新增时可选的接口类型
* 后端 listInterfaceTypes 结果 + 本地固定类型(天豹云OMS,interface_type_id=3)
* 后端若返回同 id 的类型,以本地定义为准(保证名称与 id 一致)
*/
const selectableTypes = computed(() => {
const list = qimenDialog.availableTypes.filter((t: any) => Number(t?.id) !== OMS_INTERFACE_TYPE.id)
return [...list, { ...OMS_INTERFACE_TYPE }]
})
const qimenForm = reactive<Record<string, any>>({ ...qimenFormDefault })
/** 接口类型联动:QM_WMS 专属字段是否展示(表单面板用) */
@ -3055,13 +3014,15 @@ function openQimenForm(config: any) {
Object.assign(qimenForm, qimenFormDefault, config)
// 从现有配置提取接口类型标识(用于表单条件渲染)
qimenForm.interface_code = config.interface_code || config.interface_category || ''
// is_enabled = 0 情况兼容
if (config.is_enabled !== undefined) qimenForm.is_enabled = config.is_enabled
// 天豹云OMS(interface_type_id=3):统一使用本地类型标识,避免后端未回传 interface_code 时显示异常
if (Number(config.interface_type_id) === OMS_INTERFACE_TYPE.id) {
qimenForm.interface_code = OMS_INTERFACE_TYPE.interface_code
}
} else {
Object.assign(qimenForm, qimenFormDefault)
// 若只有一个接口类型,自动选中
if (selectableTypes.value.length === 1) {
qimenForm.interface_code = selectableTypes.value[0]?.interface_code ?? ''
// 若后端只返回一个接口类型,自动选中(不含本地固定类型)
if (qimenDialog.availableTypes.length === 1) {
qimenForm.interface_code = qimenDialog.availableTypes[0]?.interface_code ?? ''
}
}
qimenDialog.formVisible = true
@ -3093,17 +3054,18 @@ async function submitQimenForm() {
return
}
}
// 解析 interface_type_id:编辑时来自已有配置,新增时从 availableTypes 按 interface_code 反查
// 解析 interface_type_id:编辑时来自已有配置,新增时从 selectableTypes 按 interface_code 反查
// 天豹云OMS 在 selectableTypes 中固定为 id=3
const resolvedTypeId: number | undefined =
qimenDialog.editingConfig?.interface_type_id ??
qimenDialog.availableTypes.find((t: any) => t.interface_code === qimenForm.interface_code)?.id
selectableTypes.value.find((t: any) => t.interface_code === qimenForm.interface_code)?.id
if (!resolvedTypeId) {
ElMessage.warning('无法解析接口类型ID,请稍后重试或刷新页面')
return
}
qimenDialog.formLoading = true
try {
// 仅提交 saveApiConfig 接口所要求的字段
// 仅提交 saveApiConfig 接口所要求的字段(对齐 2026-11-14 最新入参)
const payload: Record<string, any> = {
id: qimenDialog.contractRow?.id as number,
interface_type_id: resolvedTypeId,
@ -3115,10 +3077,7 @@ async function submitQimenForm() {
payload.qimen_customer_id = qimenForm.qimen_customer_id.trim()
payload.qimen_warehouse_code = qimenForm.qimen_warehouse_code.trim()
}
// 回调地址(所有类型)
if (qimenForm.callback_url?.trim()) {
payload.callback_url = qimenForm.callback_url.trim()
}
// ⚠️ callback_url 已不再是有效入参(后端统一取 config.openapi.defaultCallbackUrl),不再下发
const res = await saveApiConfig(payload as any) as any
if (res?.flag === 'success' || res?.code === 200) {
const action = res.data?.action === 'create' ? '新增' : '更新'

View File

@ -23,20 +23,28 @@ export const LOCAL_INTERFACE_TYPES: { interface_code: string; interface_name: st
{ interface_code: 'OPEN_API', interface_name: '第三方接口' }
]
/**
* 天豹云OMS 接口类型(前端本地定义,固定 interface_type_id = 3)
* - 下拉选项始终存在,不依赖后端 listInterfaceTypes 是否返回
* - 无需填写回调地址
*/
export const OMS_INTERFACE_TYPE = {
id: 3,
interface_code: 'TBYC_OMS',
interface_name: '天豹云OMS'
}
// 接口配置(apiConfig)表单默认配置
// 对齐 saveApiConfig 最新入参(2026-11-14):只保留 app_name + 奇门三字段;
// API 版本 / 联系人 / 联系电话 / 邮箱 / 启用状态 / 回调地址 均已不是入参
// ⚠️ interface_type_id=3(天豹云OMS)由服务端映射为 2(货主开放接口)落库
export const qimenFormDefault = {
interface_type_id: undefined as number | undefined,
interface_code: '' as string, // 本地控制字段,不提交,用于区分 QM_WMS / OPEN_API 等类型
interface_code: '' as string, // 本地控制字段,不提交,用于区分 QM_WMS / OPEN_API / TBYC_OMS 等类型
app_name: '',
qimen_app_key: '',
qimen_customer_id: '',
qimen_warehouse_code: '',
api_version: '1.0',
contact_person: '',
contact_phone: '',
email: '',
is_enabled: 1 as number,
callback_url: ''
qimen_warehouse_code: ''
}
// 面单余额调整弹窗默认配置