1
This commit is contained in:
parent
5b58f329ea
commit
49655a585a
@ -58,6 +58,8 @@ export type DeliveryOrderListItem = {
|
||||
buyer_message?: string
|
||||
seller_message?: string
|
||||
remark?: string
|
||||
/** 货主备注 */
|
||||
store_remark?: string
|
||||
total_amount?: string
|
||||
item_amount?: string
|
||||
discount_amount?: string
|
||||
|
||||
@ -13,8 +13,10 @@ export type OrderListParams = {
|
||||
/**
|
||||
* 统一 where 条件对象(推荐 { operator, value, type } 标准结构,历史简写自动标准化)。
|
||||
* - 禁止传入 warehouse_id / warehouseId(由后端根据当前登录仓库上下文自动注入)。
|
||||
* - 虚拟字段:buyer_message_has(买家留言筛选,value=true 有留言/value=false 无留言)、
|
||||
* express_numbers / waybill_codes(运单号筛选)。
|
||||
* - 虚拟字段:buyer_message_has(覆盖 buyer_message/seller_message/remark 三个字段,任一有值即为有留言,value=true/false)、
|
||||
* express_numbers / waybill_codes(运单号筛选)、
|
||||
* wave_index(波次内序号筛选,联查 wms_order_wave_index,支持 eq/in/gt/lt/ge/le/between/notbetween,
|
||||
* between 要求 value 为长度 2 的数组,如 {"wave_index":{"operator":"between","value":[1,50]}})。
|
||||
*/
|
||||
where?: Record<string, any>
|
||||
sort?: {
|
||||
@ -34,8 +36,9 @@ export type OrderListPagination = {
|
||||
hasNext?: boolean
|
||||
}
|
||||
|
||||
/** order.list 响应 data 结构
|
||||
* - list 每条 raw 行数据新增 store_remark(货主备注)字段
|
||||
/** 订单工作台 / 各订单模块 list 响应 data 结构
|
||||
* - list 每条 raw 行数据新增 store_remark(货主备注)字段、wave_index(波次内序号,联查 wms_order_wave_index,无记录时为 0)
|
||||
* - 各模块响应描述以各自 module.json 为准(部分模块 list 仅含 wave_index)
|
||||
*/
|
||||
export type OrderWorkbenchListResponse = {
|
||||
list: any[]
|
||||
|
||||
@ -9,6 +9,7 @@ import {
|
||||
const v = "1.0";
|
||||
|
||||
export type { OrderWorkbenchListResponse, OrderListPagination } from '@/api/order.index/orderindex'
|
||||
import type { OrderWorkbenchListResponse as PendingOrderWorkbenchListResponse } from '@/api/order.index/orderindex'
|
||||
export type {
|
||||
PendingOrderDownloadCreateTemplateResponse,
|
||||
PendingOrderManualWaybillParams,
|
||||
@ -38,10 +39,22 @@ export type OrderPagination = {
|
||||
|
||||
export type PendingOrderListParams = {
|
||||
pagination?: OrderPagination;
|
||||
/**
|
||||
* 统一 where 条件对象;禁止传入 warehouse_id / warehouseId。where 无字段白名单,可直接传订单表列名。
|
||||
* lock_status 锁定状态筛选(筛选值用数据库原始枚举 none/warehouse/store,不是响应中的 Y/N;ne 表示不等于;条件值为空自动忽略):
|
||||
* 未锁定 {"lock_status":"none"};已锁定(所有非 none){"lock_status":{"operator":"ne","value":"none"}}
|
||||
*/
|
||||
where?: OrderWhere;
|
||||
sort?: OrderSort;
|
||||
};
|
||||
|
||||
/**
|
||||
* 待处理订单列表响应 data(与 order.pendingOrder.list module.json 对齐)。
|
||||
* - list 每项含 store_remark(货主备注)、wave_index(波次内序号,无记录时为 0)。
|
||||
* - list 每项 lock_status 统一输出为 Y/N:none(含空值)→ 'N',其余值(如 warehouse/store)→ 'Y'。
|
||||
*/
|
||||
export type PendingOrderListResponse = PendingOrderWorkbenchListResponse;
|
||||
|
||||
export type PendingOrderDetailParams = {
|
||||
ids?: Array<number | string> | string | number;
|
||||
id?: number | string;
|
||||
|
||||
@ -355,10 +355,16 @@ export function batchQuickRecheck(data: BatchQuickRecheckParams): Promise<any> {
|
||||
}
|
||||
|
||||
export type QueryRecheckOrderSingleListWhere = {
|
||||
/** 运单号/订单号模糊搜索 */
|
||||
keyword?: string
|
||||
/** 波次号精确匹配 */
|
||||
wave_no?: string
|
||||
recheck_status?: string
|
||||
pick_status?: string
|
||||
/** 波次内序号范围筛选,如 {"operator":"between","value":[起,止]};或使用 wave_index_min / wave_index_max */
|
||||
wave_index?: { operator?: string; value?: [number, number] | number[] } | number
|
||||
wave_index_min?: number
|
||||
wave_index_max?: number
|
||||
}
|
||||
|
||||
export type QueryRecheckOrderSingleListParams = {
|
||||
@ -469,8 +475,50 @@ export function batchQuickRecheckByWave(data: BatchQuickRecheckByWaveParams): Pr
|
||||
} as any)
|
||||
}
|
||||
|
||||
/** order.recheckOrder.confirmIntercept:确认拦截,入参 order_id,匹配单个订单并标记拦截 */
|
||||
export function confirmIntercept(data: ConfirmRecheckParams): Promise<any> {
|
||||
/** order.recheckOrder.confirmIntercept 请求参数:订单 ID 列表,支持数组或以逗号分隔的字符串;兼容 id / order_id / orderId 单值写法 */
|
||||
export type ConfirmInterceptParams = {
|
||||
/** 订单 ID 列表,支持数组或以逗号分隔的字符串 */
|
||||
ids?: Array<number | string> | string
|
||||
/** 单值兼容写法 */
|
||||
id?: number | string
|
||||
order_id?: number | string
|
||||
orderId?: number | string
|
||||
}
|
||||
|
||||
/** order.recheckOrder.confirmIntercept 响应 data */
|
||||
export type ConfirmInterceptResponse = {
|
||||
/** 拦截成功的订单列表 */
|
||||
success: unknown[]
|
||||
/** 拦截失败的订单列表 */
|
||||
failed: unknown[]
|
||||
/** 成功数量 */
|
||||
success_count: number
|
||||
/** 失败数量 */
|
||||
failed_count: number
|
||||
}
|
||||
|
||||
function pickConfirmInterceptBody(
|
||||
data: ConfirmInterceptParams
|
||||
): Record<string, Array<number | string> | string> {
|
||||
if (data.ids !== undefined && data.ids !== null && String(data.ids).trim() !== '') {
|
||||
return { ids: data.ids }
|
||||
}
|
||||
const single =
|
||||
data.order_id !== undefined && data.order_id !== null && `${data.order_id}`.trim() !== ''
|
||||
? String(data.order_id).trim()
|
||||
: data.id !== undefined && data.id !== null && `${data.id}`.trim() !== ''
|
||||
? String(data.id).trim()
|
||||
: data.orderId !== undefined && data.orderId !== null && `${data.orderId}`.trim() !== ''
|
||||
? String(data.orderId).trim()
|
||||
: undefined
|
||||
if (single === undefined) {
|
||||
throw new Error('订单 ID 不能为空(ids / id / order_id / orderId)')
|
||||
}
|
||||
return { ids: single }
|
||||
}
|
||||
|
||||
/** order.recheckOrder.confirmIntercept:库内拦截确定,入参 ids 批量匹配订单并标记拦截 */
|
||||
export function confirmIntercept(data: ConfirmInterceptParams): Promise<any> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
@ -479,7 +527,7 @@ export function confirmIntercept(data: ConfirmRecheckParams): Promise<any> {
|
||||
v,
|
||||
timestamp: Date.now()
|
||||
},
|
||||
data: pickConfirmRecheckBody(data),
|
||||
data: pickConfirmInterceptBody(data),
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
@ -516,6 +564,58 @@ export function interceptScan(data: InterceptScanParams): Promise<any> {
|
||||
} as any)
|
||||
}
|
||||
|
||||
/** order.recheckOrder.recheckOrderList 请求参数 */
|
||||
export type RecheckOrderListParams = {
|
||||
/** 列表模式:single(散单模式,默认)/ group(团购模式) */
|
||||
list_type?: 'single' | 'group'
|
||||
/** 筛选条件。散单模式支持 keyword(运单号/订单号模糊搜索)、wave_no(精确匹配)、recheck_status、pick_status、wave_index(波次内序号范围筛选,如 {"operator":"between","value":[起,止]},或 wave_index_min / wave_index_max);团购模式支持 wave_no(模糊搜索)、wave_type、wave_status */
|
||||
where?: {
|
||||
keyword?: string
|
||||
wave_no?: string
|
||||
recheck_status?: string
|
||||
pick_status?: string
|
||||
/** 波次内序号范围筛选(散单模式),如 {"operator":"between","value":[起,止]};或使用 wave_index_min / wave_index_max */
|
||||
wave_index?: { operator?: string; value?: [number, number] | number[] } | number
|
||||
wave_index_min?: number
|
||||
wave_index_max?: number
|
||||
wave_type?: number
|
||||
wave_status?: string
|
||||
}
|
||||
pagination?: {
|
||||
page?: number
|
||||
pageSize?: number
|
||||
}
|
||||
}
|
||||
|
||||
/** order.recheckOrder.recheckOrderList 响应 data */
|
||||
export type RecheckOrderListResponse = {
|
||||
/** 散单模式(list_type=single):订单数组,每项含 order_id、delivery_order_code、order_type、wave_id、wave_no、pick_status、recheck_status、shop_nick、logistics_name、items_count、items_total、wave_index、status、create_at、pick_time、recheck_time。团购模式(list_type=group):波次汇总数组,每项含 wave_id、wave_no、wave_type、wave_status、total_orders、processed_orders、creator、create_time、update_time、order_count、reviewed_count、unreviewed_count、review_assignment_status(unreviewed/partially_reviewed/reviewed) */
|
||||
list: Array<Record<string, unknown>>
|
||||
pagination: {
|
||||
page?: number
|
||||
pageSize?: number
|
||||
total?: number
|
||||
totalPages?: number
|
||||
hasPrevious?: boolean
|
||||
hasNext?: boolean
|
||||
}
|
||||
}
|
||||
|
||||
/** order.recheckOrder.recheckOrderList:复核订单列表查询(散单/团购模式) */
|
||||
export function recheckOrderList(data: RecheckOrderListParams = {}): Promise<any> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'order.recheckOrder.recheckOrderList',
|
||||
v,
|
||||
timestamp: Date.now()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
export const orderRecheckOrder = {
|
||||
scanOrder,
|
||||
batchQuickRecheck,
|
||||
@ -523,7 +623,8 @@ export const orderRecheckOrder = {
|
||||
confirmRecheck,
|
||||
confirmIntercept,
|
||||
interceptScan,
|
||||
queryRecheckOrderSingleList
|
||||
queryRecheckOrderSingleList,
|
||||
recheckOrderList
|
||||
}
|
||||
|
||||
export type {
|
||||
|
||||
@ -467,7 +467,8 @@ export type WaveStrategyFallbackOrderListRow = Record<string, unknown> & {
|
||||
buyer_message?: string
|
||||
item_snapshot?: string
|
||||
store_remark?: string
|
||||
excluded_reason?: string
|
||||
/** 排除原因中文标记:已锁定(lock_status 非 none)、已拦截、已打印、未匹配策略 */
|
||||
excluded_reason?: '已锁定' | '已拦截' | '已打印' | '未匹配策略' | string
|
||||
}
|
||||
|
||||
export type WaveStrategyFallbackOrderListPagination = {
|
||||
@ -562,6 +563,8 @@ export type WaveBatchAllocateExpressTaskProgressResponse = {
|
||||
processed_order_count?: number
|
||||
success_order_count?: number
|
||||
failed_order_count?: number
|
||||
/** 因已锁定(lock_status 非 none)被跳过、未参与快递号分配的订单 ID 列表(任务进度与 result 中均返回) */
|
||||
skipped_locked_order_ids?: Array<number | string>
|
||||
progress_percent?: number
|
||||
duration_ms?: number
|
||||
error_message?: string
|
||||
@ -968,6 +971,7 @@ export type WaveSingleFetchByIdsResponse = {
|
||||
fetched_order_ids: Array<number>
|
||||
fetched_order_count: number
|
||||
excluded_existing_wave_order_ids?: Array<number>
|
||||
/** 因已锁定(lock_status 非 none)被排除、不会被抓取波次的订单 ID 列表(成功与无可抓取订单两个返回分支均返回) */
|
||||
excluded_locked_order_ids?: Array<number>
|
||||
skipped_order_ids?: Array<number>
|
||||
not_found_order_ids?: Array<number>
|
||||
|
||||
@ -157,10 +157,60 @@ export function pickWavePickTaskComplete(
|
||||
} as any)
|
||||
}
|
||||
|
||||
/** pick.waveClaimScan 请求参数:扫描面单号领取整波(领单) */
|
||||
export type PickWaveClaimScanParams = {
|
||||
/** 面单号(运单号,wms_order_express.waybill_code) */
|
||||
waybill_no: string
|
||||
}
|
||||
|
||||
/** pick.waveClaimScan 响应 data */
|
||||
export type PickWaveClaimScanResponse = {
|
||||
/** 波次ID */
|
||||
wave_id: number
|
||||
/** 波次号 */
|
||||
wave_no: string
|
||||
/** 波次类型:1-团购 2-散单 */
|
||||
wave_type: number
|
||||
/** 波次来源:0-普通波次 1-管理后台策略任务 2-PDA策略任务 */
|
||||
wave_source: number
|
||||
/** 拣货模式:1-团购小波次 2-散单单品单件 3-散单先拣后分 4-边拣边分 5-团购大波次(0 表示无关联拣货任务) */
|
||||
pick_mode: number
|
||||
/** 面单号命中的订单ID */
|
||||
matched_order_id: number
|
||||
/** 扫描的面单号 */
|
||||
waybill_no: string
|
||||
/** 波次下订单总数 */
|
||||
total_order_count: number
|
||||
/** 本次置为 fin 的订单数(已全部领单时返回 0) */
|
||||
claimed_order_count: number
|
||||
/** 操作结果:claimed(整波领单完成)或 already_claimed(波次已领单) */
|
||||
status: string
|
||||
/** 提示文案 */
|
||||
tip: string
|
||||
}
|
||||
|
||||
/** pick.waveClaimScan:扫描面单号领取整波(领单)。按面单号定位订单后反查波次,仅支持大团购(pick_mode=5)与非抓取散单(source=0)整波领单 */
|
||||
export function pickWaveClaimScan(
|
||||
data: PickWaveClaimScanParams
|
||||
): Promise<PickWaveClaimScanResponse & { code?: number; message?: string; data?: Partial<PickWaveClaimScanResponse> }> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'pick.waveClaimScan',
|
||||
v,
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
export const pick = {
|
||||
query: pickQuery,
|
||||
wavePickComplete: pickWavePickComplete,
|
||||
wavePickTaskDetail: pickWavePickTaskDetail,
|
||||
wavePickTaskSubmit: pickWavePickTaskSubmit,
|
||||
wavePickTaskComplete: pickWavePickTaskComplete
|
||||
wavePickTaskComplete: pickWavePickTaskComplete,
|
||||
waveClaimScan: pickWaveClaimScan
|
||||
}
|
||||
|
||||
@ -91,15 +91,109 @@ export function expressInterfaceCreate(data: ExpressInterfaceCreateParams) {
|
||||
}
|
||||
|
||||
export type ExpressInterfaceUpdateParams = {
|
||||
/** 快递接口 ID,兼容 interface_id / interfaceId */
|
||||
id: number
|
||||
/** 接口名称 */
|
||||
name?: string
|
||||
/** 快递编码(存大写);与 platform_code / sys_express_code 任一变更时重新解析系统快递编码 */
|
||||
express_code?: string
|
||||
/** 平台编码(PDD/CAINIAO/DY/KS/SPH/XHS/JD/QT) */
|
||||
platform_code?: string
|
||||
/** 系统快递编码(支持 sysExpressCode);未传时按 express_code + platform_code 自动匹配 */
|
||||
sys_express_code?: string
|
||||
/** 店铺 ID(支持 shopId),正整数可空;传入该字段会同步刷新接口 token */
|
||||
shop_id?: number
|
||||
is_enabled?: number
|
||||
/** 发件人详细地址,使用 index.getShopExpressList 返回的 detail 字段值 */
|
||||
/** 平台店铺 ID(支持 platformShopId),正整数可空 */
|
||||
platform_shop_id?: number | string | null
|
||||
/** 模板 ID(支持 templateId),空字符串按 null 处理 */
|
||||
template_id?: string | null
|
||||
/** 付款方式(支持 payMode) */
|
||||
paymode?: number
|
||||
/** 品牌编码(支持 brandNo),空字符串按 null 处理 */
|
||||
brandno?: string | null
|
||||
/** 服务商类型编码(支持 providerType),空字符串按 null 处理 */
|
||||
providertype?: string | null
|
||||
/** 服务商 ID(支持 providerId) */
|
||||
providerid?: number | string
|
||||
/** 寄件人(支持 senderName) */
|
||||
sender_name?: string
|
||||
/** 寄件电话(支持 senderTel) */
|
||||
sender_tel?: string
|
||||
/** 排序权重,可空 */
|
||||
weight?: number
|
||||
/** 重量类型(支持 weightType),可空 */
|
||||
weight_type?: number
|
||||
/** 验视员/查看者 */
|
||||
viewer?: string
|
||||
/** 客户 ID(支持 clientId) */
|
||||
client_id?: string
|
||||
/** 是否上门取件(支持 isPickup),1是 0否 */
|
||||
ispickup?: number
|
||||
/** 发货编号/寄件网点编码(支持 shipperNo) */
|
||||
shipperno?: string
|
||||
/** 打印模板 URL(支持 templateUrl) */
|
||||
template_url?: string
|
||||
/** 寄件人省份(支持 provinceName) */
|
||||
province_name?: string
|
||||
/** 寄件人城市(支持 cityName) */
|
||||
city_name?: string
|
||||
/** 寄件人区县(支持 districtName) */
|
||||
district_name?: string
|
||||
/** 发件人详细地址,使用 index.getShopExpressList 返回的 detail 字段值,非 full_address */
|
||||
address?: string
|
||||
/** 寄件人镇/街道(支持 townName) */
|
||||
town_name?: string
|
||||
/** 网点编码(支持 siteCode) */
|
||||
site_code?: string
|
||||
/** 产品类型/编码(支持 productType) */
|
||||
product_type?: string
|
||||
/** 平台店铺名称(支持 shopName) */
|
||||
shop_name?: string
|
||||
/** 扩展数据 JSON 对象(支持 extData) */
|
||||
ext_data?: Record<string, any>
|
||||
/** 是否启用(支持 isEnabled),1启用 0停用 */
|
||||
is_enabled?: number
|
||||
}
|
||||
|
||||
/** setting.expressInterface.update 响应 data(完整记录) */
|
||||
export type ExpressInterfaceUpdateResponse = {
|
||||
id?: number
|
||||
name?: string
|
||||
express_code?: string
|
||||
sys_express_code?: string
|
||||
warehouse_id?: number | null
|
||||
shop_id?: number | null
|
||||
platform_shop_id?: number | null
|
||||
template_id?: string
|
||||
paymode?: number
|
||||
brandno?: string
|
||||
providertype?: string
|
||||
providerid?: number
|
||||
platform_code?: string
|
||||
sender_name?: string
|
||||
sender_tel?: string
|
||||
weight?: number
|
||||
weight_type?: number
|
||||
viewer?: string
|
||||
client_id?: string
|
||||
is_enabled?: number
|
||||
is_share?: number
|
||||
ispickup?: number
|
||||
shipperno?: string
|
||||
template_url?: string
|
||||
ext_data?: Record<string, any> | null
|
||||
province_name?: string
|
||||
city_name?: string
|
||||
district_name?: string
|
||||
address?: string
|
||||
town_name?: string
|
||||
site_code?: string
|
||||
product_type?: string
|
||||
shop_name?: string
|
||||
express?: Record<string, any> | null
|
||||
express_name?: string
|
||||
express_polyapi_extra_info?: string
|
||||
express_pdd_code?: string
|
||||
}
|
||||
|
||||
export function expressInterfaceUpdate(data: ExpressInterfaceUpdateParams & Record<string, any>) {
|
||||
|
||||
@ -1222,9 +1222,10 @@ export const claimStatusFilterOptions = [
|
||||
{ label: '已认领', value: 'fin' },
|
||||
]
|
||||
|
||||
/** 锁定状态(待处理等订单页):只区分是否锁定。未锁定 = eq none,已锁定 = ne none(覆盖 warehouse/store 等所有非 none 值) */
|
||||
export const lockStatusFilterOptions = [
|
||||
{ label: '未锁定', value: 'none' },
|
||||
{ label: '仓库锁定', value: 'warehouse' },
|
||||
{ label: '未锁定', value: '__lock_status_none__', operator: 'eq', conditionValue: 'none' },
|
||||
{ label: '已锁定', value: '__lock_status_locked__', operator: 'ne', conditionValue: 'none' },
|
||||
]
|
||||
|
||||
/** 单号类字段:支持 IN(逗号分隔)批量查询 */
|
||||
|
||||
@ -1064,16 +1064,15 @@ async function handleConfirmInterceptBatch() {
|
||||
|
||||
confirmInterceptLoading.value = true
|
||||
try {
|
||||
const results = await Promise.allSettled(
|
||||
ids.map((id) => confirmIntercept({ order_id: id }))
|
||||
)
|
||||
const successCount = results.filter((r) => {
|
||||
if (r.status !== 'fulfilled') return false
|
||||
const res = r.value as any
|
||||
return res && (res.code === 1 || res.code === 200 || res.flag === 'success')
|
||||
}).length
|
||||
const failedCount = results.length - successCount
|
||||
if (successCount === results.length) {
|
||||
const res = (await confirmIntercept({ ids })) as any
|
||||
if (!res || (res.code !== 1 && res.code !== 200 && res.flag !== 'success')) {
|
||||
ElMessage.error(res?.message || '库内拦截确定失败')
|
||||
return
|
||||
}
|
||||
const data = res?.data && typeof res.data === 'object' && !Array.isArray(res.data) ? res.data : res
|
||||
const successCount = Number(data?.success_count ?? 0)
|
||||
const failedCount = Number(data?.failed_count ?? 0)
|
||||
if (successCount === ids.length) {
|
||||
ElMessage.success(`库内拦截确定成功 ${successCount} 条`)
|
||||
} else if (successCount > 0) {
|
||||
ElMessage.warning(`库内拦截确定成功 ${successCount} 条,失败 ${failedCount} 条`)
|
||||
|
||||
@ -1117,7 +1117,7 @@ async function handleConfirmIntercept() {
|
||||
return
|
||||
}
|
||||
try {
|
||||
const res = await confirmIntercept({ order_id: id })
|
||||
const res = await confirmIntercept({ ids: [id] })
|
||||
const ok = res && (res.code === 1 || res.code === 200 || res.flag === 'success')
|
||||
if (ok) {
|
||||
ElMessage.success('拦截操作已提交')
|
||||
|
||||
@ -134,6 +134,16 @@
|
||||
</el-tag>
|
||||
</template>
|
||||
|
||||
<template #column-source="{ row }">
|
||||
<el-tag size="small" :type="getWaveSourceTagType(row.source)">
|
||||
{{ formatWaveSource(row.source) }}
|
||||
</el-tag>
|
||||
</template>
|
||||
|
||||
<template #column-logistics_code="{ row }">
|
||||
<span>{{ row.logistics_code || '—' }}</span>
|
||||
</template>
|
||||
|
||||
<template #column-item_detail_machine="{ row }">
|
||||
<span class="order-info-text">{{ row.item_detail_machine || '—' }}</span>
|
||||
</template>
|
||||
@ -890,6 +900,8 @@ import {
|
||||
formatWavePickAssignmentStatusLabel,
|
||||
formatWaveReviewAssignmentStatusLabel,
|
||||
getWaveAssignmentAggregateTagType,
|
||||
formatWaveSource,
|
||||
getWaveSourceTagType,
|
||||
buildOutboundPrintQueue,
|
||||
fetchOutboundWaveList,
|
||||
resolveOutboundPrintRowKey
|
||||
@ -1431,8 +1443,11 @@ async function loadData() {
|
||||
const start = Date.now()
|
||||
try {
|
||||
const rawWhere = buildWhereConditions(scanBox.value?.getConditions?.() || {})
|
||||
if (!showInternalSourceWaves.value) {
|
||||
rawWhere.source = 0
|
||||
// 用户显式选择「来源」筛选时以其为准;否则按开关控制是否显示库内抓取波次(默认仅普通波次 source=0)
|
||||
if (rawWhere.source === undefined || rawWhere.source === null || rawWhere.source === '') {
|
||||
if (!showInternalSourceWaves.value) {
|
||||
rawWhere.source = 0
|
||||
}
|
||||
}
|
||||
const where = sanitizeWaveWhere(rawWhere)
|
||||
if (where.wave_type === undefined || where.wave_type === null || where.wave_type === '') {
|
||||
|
||||
@ -134,6 +134,16 @@
|
||||
</el-tag>
|
||||
</template>
|
||||
|
||||
<template #column-source="{ row }">
|
||||
<el-tag size="small" :type="getWaveSourceTagType(row.source)">
|
||||
{{ formatWaveSource(row.source) }}
|
||||
</el-tag>
|
||||
</template>
|
||||
|
||||
<template #column-logistics_code="{ row }">
|
||||
<span>{{ row.logistics_code || '—' }}</span>
|
||||
</template>
|
||||
|
||||
<template #column-item_detail_machine="{ row }">
|
||||
<span class="order-info-text">{{ row.item_detail_machine || '—' }}</span>
|
||||
</template>
|
||||
@ -485,6 +495,8 @@ import {
|
||||
formatWavePickAssignmentStatusLabel,
|
||||
formatWaveReviewAssignmentStatusLabel,
|
||||
getWaveAssignmentAggregateTagType,
|
||||
formatWaveSource,
|
||||
getWaveSourceTagType,
|
||||
fetchOutboundPrintDataFromPendingOrders,
|
||||
fetchOutboundWaveList,
|
||||
resolveOutboundPrintRowKey
|
||||
|
||||
@ -188,6 +188,16 @@ export const waveAvailableFields = [
|
||||
{ label: '否', value: 0 }
|
||||
]
|
||||
}), group: WAVE_SCAN_OTHER_GROUP },
|
||||
{ ...waveScanBasicField({
|
||||
label: '来源',
|
||||
value: 'source',
|
||||
type: 'select',
|
||||
options: [
|
||||
{ label: '普通波次', value: 0 },
|
||||
{ label: '后台策略', value: 1 },
|
||||
{ label: 'PDA策略', value: 2 }
|
||||
]
|
||||
}), group: WAVE_SCAN_OTHER_GROUP },
|
||||
{ ...waveScanBasicField({ label: '快递', value: 'logistics_name', type: 'text' }), group: WAVE_SCAN_OTHER_GROUP },
|
||||
{ ...waveScanBasicField({ label: '创建人', value: 'creator', type: 'text' }), group: WAVE_SCAN_OTHER_GROUP },
|
||||
]
|
||||
@ -354,6 +364,8 @@ export const waveBatchColumns = applyWaveListCopyActions([
|
||||
// { prop: 'item_part_type', label: '商品类型', minWidth: 120 },
|
||||
// { prop: 'item_part', label: '商品部位', minWidth: 220 },
|
||||
{ prop: 'distinguish_express', label: '区分快递', minWidth: 100 },
|
||||
{ prop: 'source', label: '来源', minWidth: 100 },
|
||||
{ prop: 'logistics_code', label: '快递编码', minWidth: 110 },
|
||||
{ prop: 'storage_assignment_status', label: '库位分配', minWidth: 120 },
|
||||
{ prop: 'express_assignment_status', label: '快递分配', minWidth: 120 },
|
||||
{ prop: 'print_assignment_status', label: '打印状态', minWidth: 110 },
|
||||
@ -1133,6 +1145,22 @@ export function formatPickTaskSource(value: unknown): string {
|
||||
return value === null || value === undefined || value === '' ? '-' : String(value)
|
||||
}
|
||||
|
||||
/** 波次列表 order.wave.batchList 的来源文案:0 普通波次,1 管理后台策略任务,2 PDA 策略任务 */
|
||||
export function formatWaveSource(value: unknown): string {
|
||||
const num = Number(value)
|
||||
if (num === 0) return '普通波次'
|
||||
if (num === 1) return '后台策略'
|
||||
if (num === 2) return 'PDA策略'
|
||||
return value === null || value === undefined || value === '' ? '—' : String(value)
|
||||
}
|
||||
|
||||
export function getWaveSourceTagType(value: unknown): 'info' | 'warning' | 'success' | 'danger' {
|
||||
const num = Number(value)
|
||||
if (num === 1) return 'warning'
|
||||
if (num === 2) return 'success'
|
||||
return 'info'
|
||||
}
|
||||
|
||||
export function getPickTaskStatusTagType(value: unknown): 'info' | 'warning' | 'success' | 'danger' {
|
||||
const num = Number(value)
|
||||
if (num === 0) return 'info'
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user