From bf9bba5059a89f55a45b08ce7f90b0c618b9d6a8 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Sun, 20 Sep 2026 05:01:59 +0800 Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=B3=A2=E6=AC=A1/=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=96=B0=E5=A2=9E=E3=80=8C=E7=A1=AE=E8=AE=A4=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E7=8A=B6=E6=80=81=E3=80=8D=E3=80=8C=E9=A2=86=E6=96=99?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E3=80=8D=EF=BC=8C=E6=B3=A2=E6=AC=A1=E9=A1=B5?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=89=AB=E7=A0=81=E7=A1=AE=E8=AE=A4=E6=89=93?= =?UTF-8?q?=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 波次:注册全局扫码事件(src/composables/useBarcodeScan.ts),长度超过 8 位的面单号提交 order.wave.confirmPrintScan 整波确认打印,切页/失活自动摘除监听;tab 区新增「确认打印未领单 N」角标,order.wave.confirmPrintUnclaimedWaveCount 长轮询实时刷新(离开页面停止、回到页面重新轮询);列表新增确认打印状态/领料状态筛选、列与明细展示 订单:列表补齐「确认打印状态」(confirm_print_status) 与「领料状态」(claim_status) 列;ScanBox 流程状态组新增两项筛选(待处理/待出库/待处理异常/配送订单);导出字段白名单新增「领料状态」「确认打印状态」(流程状态分组,52 → 54);claim_status 文案由「认领」统一为「领料」 --- src/api/order.wave/orderwave.ts | 93 +++++++++ src/api/order/order.ts | 19 ++ src/composables/useBarcodeScan.ts | 196 ++++++++++++++++++ .../config/order-common-config.ts | 90 +++++--- .../order/orderManagement/deliveryOrder.vue | 6 + .../order/orderManagement/exceptionOrder.vue | 12 ++ .../order/orderManagement/outboundOrder.vue | 12 ++ .../order/orderManagement/pendingOrder.vue | 12 ++ .../waveOrder/GroupWaveBatchListPanel.vue | 14 ++ .../waveOrder/SandanWaveBatchListPanel.vue | 14 ++ .../component/WaveBatchDetailPanel.vue | 12 ++ .../order/waveOrder/config/wave-config.ts | 76 +++++++ src/views/order/waveOrder/index.vue | 178 +++++++++++++++- 13 files changed, 703 insertions(+), 31 deletions(-) create mode 100644 src/composables/useBarcodeScan.ts diff --git a/src/api/order.wave/orderwave.ts b/src/api/order.wave/orderwave.ts index cfc21e20..2f32b933 100644 --- a/src/api/order.wave/orderwave.ts +++ b/src/api/order.wave/orderwave.ts @@ -1266,7 +1266,100 @@ export function orderWaveBatchRemoveOrders( } as any) } +/** order.wave.confirmPrintScan 入参:扫描波次内任一订单的面单号确认打印 */ +export type WaveConfirmPrintScanParams = { + /** 面单号/运单号(必填,用于定位订单及所属波次) */ + waybill_no: string +} + +/** order.wave.confirmPrintScan 业务 data */ +export type WaveConfirmPrintScanResponse = { + /** 扫描的面单号 */ + waybill_no?: string + /** 面单号匹配到的订单ID */ + matched_order_id?: number + /** 波次ID */ + wave_id?: number + /** 波次编码 */ + wave_no?: string + /** 波次下总订单数 */ + total_order_count?: number + /** 波次下拦截订单数(跳过确认) */ + intercepted_order_count?: number + /** 已确认打印订单数(confirm_print_status='fin') */ + confirmed_order_count?: number + /** 本次新增确认订单数(仅 status=confirmed 时返回) */ + newly_confirmed_order_count?: number + /** confirmed=本次完成确认 / already_confirmed=已全部确认 */ + status: 'confirmed' | 'already_confirmed' | string +} + +/** + * order.wave.confirmPrintScan:扫描波次内任一订单的面单号,将该波次下全部已打印(print_status='fin') + * 且非拦截订单批量置 confirm_print_status='fin',并写订单操作日志(ORDER_CONFIRM_PRINT)。 + * - 拦截订单跳过(不确认、不阻断); + * - 波次下存在未打印订单(print_status != 'fin')时阻断:返回 unprinted_order_count; + * - 全部已确认时重复扫描返回 status=already_confirmed。 + */ +export function orderWaveConfirmPrintScan( + data: WaveConfirmPrintScanParams +): Promise; unprinted_order_count?: number }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.wave.confirmPrintScan', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +/** order.wave.confirmPrintUnclaimedWaveCount 入参:长轮询上次数量 */ +export type WaveConfirmPrintUnclaimedWaveCountParams = { + /** + * 上次返回的数量(长轮询游标): + * 不传 → 立即返回当前值(status=current);传入且与当前值不同 → 立即返回新值(status=changed); + * 相同 → 挂起等待,最长 60 秒(期间变化立即返回 changed,超时重查后返回 timeout)。 + */ + last_count?: number +} + +/** order.wave.confirmPrintUnclaimedWaveCount 业务 data */ +export type WaveConfirmPrintUnclaimedWaveCountResponse = { + /** 已确认打印(confirm_print_status='fin')但未领单(claim_status != 'fin')订单涉及的波次数量 */ + count: number + /** current=直接返回当前值 / changed=数量已变化 / timeout=等待超时后返回当前值 */ + status: 'current' | 'changed' | 'timeout' | string +} + +/** + * order.wave.confirmPrintUnclaimedWaveCount:查询「已确认打印但未领单」波次数量,支持长轮询。 + * 注意:长轮询最长挂起 60 秒,超过请求层默认 10 秒超时,故单独放开 timeout。 + */ +export function orderWaveConfirmPrintUnclaimedWaveCount( + data: WaveConfirmPrintUnclaimedWaveCountParams = {} +): Promise }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.wave.confirmPrintUnclaimedWaveCount', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true, + // 长轮询最长等待 60 秒(请求层默认 10 秒会提前中断) + timeout: 70000 + } as any) +} + export const orderWave = { + confirmPrintScan: orderWaveConfirmPrintScan, + confirmPrintUnclaimedWaveCount: orderWaveConfirmPrintUnclaimedWaveCount, wavePickTaskList: orderWaveWavePickTaskList, wavePickTaskCancel: orderWaveWavePickTaskCancel, wavePickTaskCancelSelf: orderWaveWavePickTaskCancelSelf, diff --git a/src/api/order/order.ts b/src/api/order/order.ts index 6de060a6..7ac66112 100644 --- a/src/api/order/order.ts +++ b/src/api/order/order.ts @@ -34,6 +34,17 @@ export type WaveBatchListWhere = { express_assignment_status?: 'unassigned' | 'partially_assigned' | 'assigned' /** 英文枚举:unprinted | partially_printed | printed */ print_assignment_status?: 'unprinted' | 'partially_printed' | 'printed' + /** + * 确认打印状态(仅 eq,不区分大小写)。英文枚举:unconfirmed | partially_confirmed | confirmed + * 判定按波次下订单 confirm_print_status='fin' 聚合:0=unconfirmed,>0 且 <总数=partially_confirmed,=总数且>0=confirmed。 + * 注意:列表返回的是中文文案(未确认打印/部分确认打印/已确认打印),与筛选入参是两套。 + */ + confirm_print_assignment_status?: 'unconfirmed' | 'partially_confirmed' | 'confirmed' + /** + * 领料状态(仅 eq,不区分大小写)。英文枚举:unclaimed | claimed(二态),也兼容中文 未领料/已领料。 + * 注意:列表返回的是中文文案(未领料/已领料)。 + */ + claim_assignment_status?: 'unclaimed' | 'claimed' /** 英文枚举:unpicked | partially_picked | picked */ pick_assignment_status?: 'unpicked' | 'partially_picked' | 'picked' /** 中文:未分配 | 部分分配 | 已分配 */ @@ -88,6 +99,14 @@ export type WaveBatchListItem = Record & { storage_assignment_status?: string express_assignment_status?: string print_assignment_status?: string + /** 确认打印状态:接口返回中文(未确认打印/部分确认打印/已确认打印),筛选下发英文枚举 */ + confirm_print_assignment_status?: string + /** 领料状态:接口返回中文(未领料/已领料),筛选下发英文枚举 unclaimed/claimed */ + claim_assignment_status?: string + /** 领料时间(未领料时通常为 null) */ + claim_time?: string | null + /** 领料人 */ + claim_operator?: string /** 按订单 pick_status 聚合:未拣货/部分拣货/已拣货/拣货异常 */ pick_assignment_status?: string /** 0 普通波次,1 管理后台策略任务,2 PDA 策略任务 */ diff --git a/src/composables/useBarcodeScan.ts b/src/composables/useBarcodeScan.ts new file mode 100644 index 00000000..d72c3a56 --- /dev/null +++ b/src/composables/useBarcodeScan.ts @@ -0,0 +1,196 @@ +import { onActivated, onDeactivated, onMounted, onUnmounted } from 'vue' + +/** + * 全局扫码枪监听(键盘楔入) + * + * 扫码枪 = 键盘设备:连续快速输入 + 回车(部分型号不带回车)。因此用「字符间隔 / 整段时长」 + * 区分扫码枪与人工输入,判定为扫码后回调 onScan(code)。 + * + * 参考实现:`views/express/returnUnpackwork/index.vue` 的扫码缓冲(同项目内保持一致的判定口径: + * 字符停顿 300~380ms 视为一次输入结束;人工打字间隔普遍 > 120ms)。 + */ + +/** 一段扫码允许的最大总时长(毫秒):超过视为人工输入 */ +const MAX_SEGMENT_MS = 1800 +/** 单个字符最大平均间隔(毫秒):人工打字普遍 > 120ms,超过不按扫码处理 */ +const MAX_AVG_INTERVAL_MS = 120 +/** 字符停顿超过该毫秒数视为一次输入结束(扫码枪无停顿,不带回车也能结束) */ +const IDLE_FLUSH_MS = 380 +/** 默认最小长度:长度超过 8 位(即 >= 9)才按扫码处理 */ +const DEFAULT_MIN_LENGTH = 9 + +/** 修饰键:不进入缓冲,也不中断当前段(扫码枪输出大写字母/符号会带 Shift) */ +const MODIFIER_KEYS = new Set(['Shift', 'CapsLock', 'Control', 'Alt', 'Meta', 'AltGraph', 'Dead']) + +export interface UseBarcodeScanOptions { + /** 扫码完成回调(仅在判定为扫码时触发) */ + onScan: (code: string) => void + /** 判定为扫码的最小长度,默认 9(即「长度超过 8 位」) */ + minLength?: number + /** 采集开关:返回 false 时本段按键不采集(如请求处理中) */ + enabled?: () => boolean + /** 弹窗/抽屉(.el-overlay)内不采集,默认 true:避免扫码字符污染弹窗表单、误触发业务 */ + ignoreInsideDialog?: boolean + /** 字符停顿多少毫秒视为一次输入结束,默认 380 */ + idleFlushMs?: number +} + +/** 判定为可写入条码的输入元素 */ +function isEditableElement(el: Element | null): el is HTMLInputElement | HTMLTextAreaElement { + if (!el) return false + const tag = el.tagName?.toUpperCase() + return tag === 'INPUT' || tag === 'TEXTAREA' +} + +/** + * 注册全局扫码事件。 + * + * - 监听 window keydown(捕获阶段);长度达到 minLength、整段耗时 <= 1800ms、平均字符间隔 <= 120ms + * 才判定为扫码 → onScan(code)。 + * - 无需回车:字符停顿超过 idleFlushMs 自动结束;扫码枪回车的立即结束(并阻止该回车继续触发默认行为)。 + * - 扫码字符仍会写入焦点输入框(不 preventDefault,避免破坏正常打字),判定为扫码后回滚该输入框内容。 + * - 生命周期:挂载/激活时注册,卸载/失活时移除——keep-alive 页面切到其他页面会走 onDeactivated, + * 同样会摘掉监听,切页后不会在后台响应扫码。 + */ +export function useBarcodeScan(options: UseBarcodeScanOptions) { + const { + onScan, + minLength = DEFAULT_MIN_LENGTH, + enabled, + ignoreInsideDialog = true, + idleFlushMs = IDLE_FLUSH_MS + } = options + + let listening = false + let buffer = '' + let segmentStartAt = 0 + let lastCharAt = 0 + let idleTimer: ReturnType | null = null + /** 扫码期间被持续写入的焦点输入框 + 扫码前的值(判定为扫码后回滚) */ + let rollbackEl: HTMLInputElement | HTMLTextAreaElement | null = null + let rollbackValue = '' + + function clearIdleTimer() { + if (idleTimer !== null) { + clearTimeout(idleTimer) + idleTimer = null + } + } + + /** 清空当前段(缓冲 + 停顿计时 + 回滚快照) */ + function clearSegment() { + buffer = '' + segmentStartAt = 0 + lastCharAt = 0 + rollbackEl = null + rollbackValue = '' + clearIdleTimer() + } + + /** + * 回滚扫码期间写入焦点输入框的字符。 + * 直接赋值不会触发 input 事件,需手动派发以同步 v-model(否则 Vue 状态仍是脏值,重渲染会再写回)。 + */ + function rollbackFocusedInput() { + const el = rollbackEl + const value = rollbackValue + if (!el || !el.isConnected) return + if (el.value === value) return + el.value = value + el.dispatchEvent(new Event('input', { bubbles: true })) + } + + /** 结束当前段:判定为扫码则回滚输入框并回调 onScan */ + function flushSegment(): boolean { + clearIdleTimer() + const code = buffer.replace(/\s+/g, '') + const durationMs = segmentStartAt ? Math.max(0, lastCharAt - segmentStartAt) : 0 + const avgIntervalMs = durationMs / Math.max(code.length - 1, 1) + const scannerLike = buffer.length > 0 + && code.length >= minLength + && durationMs <= MAX_SEGMENT_MS + && avgIntervalMs <= MAX_AVG_INTERVAL_MS + + if (scannerLike) rollbackFocusedInput() + clearSegment() + if (!scannerLike) return false + + onScan(code) + return true + } + + function handleKeydown(event: KeyboardEvent) { + // 输入法组合 / 长按重复 / 页面不可见 时一律不参与判定 + if (event.isComposing || event.repeat || document.hidden) return + + if (enabled && !enabled()) { + if (buffer) clearSegment() + return + } + + const key = event.key + + // 回车:结束当前段;判定为扫码时阻止回车继续触发输入框/表单默认行为 + if (key === 'Enter') { + if (!buffer) return + if (flushSegment()) { + event.preventDefault() + event.stopPropagation() + } + return + } + + if (MODIFIER_KEYS.has(key)) return + + // 其它功能键(Tab / Backspace / 方向键 / Esc 等)中断当前段,避免两次输入被拼成一段 + if (key.length !== 1) { + clearSegment() + return + } + + const target = (event.target instanceof Element ? event.target : document.activeElement) as Element | null + if (ignoreInsideDialog && target?.closest?.('.el-overlay')) return + + const now = Date.now() + if (!buffer) { + segmentStartAt = now + // 记录焦点输入框内容:扫码字符会实时写入输入框,判定为扫码后再回滚 + const active = document.activeElement + rollbackEl = isEditableElement(active) ? active : null + rollbackValue = rollbackEl ? rollbackEl.value : '' + } + lastCharAt = now + buffer += key + + clearIdleTimer() + idleTimer = setTimeout(() => { + flushSegment() + }, idleFlushMs) + } + + /** 注册监听(重复调用安全) */ + function start() { + if (listening) return + window.addEventListener('keydown', handleKeydown, true) + listening = true + } + + /** 摘除监听并清理缓冲(切页/弹窗期间不残留扫码状态) */ + function stop() { + if (!listening) { + clearSegment() + return + } + window.removeEventListener('keydown', handleKeydown, true) + listening = false + clearSegment() + } + + onMounted(start) + onUnmounted(stop) + // keep-alive 页面切换到其他页面走的是 onDeactivated(不触发 onUnmounted),需一并摘除 + onActivated(start) + onDeactivated(stop) + + return { start, stop } +} diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index 79f514cf..464eaeeb 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -127,9 +127,15 @@ export const COMMON_TRANSLATIONS: Record> = { warehouse: '已锁定', store: '已锁定' }, + /** 领料状态(订单 claim_status,与波次列表同源):none=未领料 / fin=已领料 */ claim_status: { - none: '未认领', - fin: '已认领' + none: '未领料', + fin: '已领料' + }, + /** 确认打印状态(订单 confirm_print_status):none=未确认打印 / fin=已确认打印 */ + confirm_print_status: { + none: '未确认打印', + fin: '已确认打印' }, sended_status: { none: '未发货', @@ -266,6 +272,10 @@ export const COMMON_TAG_TYPES: Record> = { none: 'info', fin: 'success' }, + confirm_print_status: { + none: 'info', + fin: 'success' + }, sended_status: { none: 'info', padding: 'warning', @@ -354,10 +364,11 @@ export type OrderExportColumnOption = { } /** - * order.export 全部可导出字段(共 52 个,对齐接口枚举): + * order.export 全部可导出字段(共 54 个,对齐接口枚举): * 仅 waybill 模式输出:系统订单号、外部订单号、平台单号、抓取波次号、商品明细; * 仅 item 模式输出:订单ID、订单号、外部单号、波次号、仓库商品名称、商品条码、商品图片、数量; * 其余为两种模式通用。 + * 流程状态分组含「领料状态」(claim_status) /「确认打印状态」(confirm_print_status),中文表头须与后端 order.export 枚举一致。 */ export const ORDER_EXPORT_ALL_COLUMNS: OrderExportColumnOption[] = [ // ===== 订单信息 ===== @@ -411,6 +422,8 @@ export const ORDER_EXPORT_ALL_COLUMNS: OrderExportColumnOption[] = [ { label: '复核完成状态', modes: ['waybill', 'item'], group: '流程状态' }, { label: '配货状态', modes: ['waybill', 'item'], group: '流程状态' }, { label: '打包状态', modes: ['waybill', 'item'], group: '流程状态' }, + { label: '领料状态', modes: ['waybill', 'item'], group: '流程状态' }, + { label: '确认打印状态', modes: ['waybill', 'item'], group: '流程状态' }, // ===== 时间信息 ===== { label: '创建时间', modes: ['waybill', 'item'], group: '时间信息' }, { label: '支付时间', modes: ['waybill', 'item'], group: '时间信息' }, @@ -979,10 +992,11 @@ export const orderDetailFullSections: OrderDetailSectionConfig[] = [ { prop: 'pick_status', label: '拣货状态', tag: true }, { prop: 'pack_status', label: '打包状态', tag: true }, { prop: 'print_status', label: '打印状态', tag: true }, + { prop: 'confirm_print_status', label: '确认打印状态', tag: true }, { prop: 'sended_status', label: '发货状态', tag: true }, - { prop: 'claim_status', label: '认领状态', tag: true }, - { prop: 'claim_operator_id', label: '认领操作人ID' }, - { prop: 'claim_operator', label: '认领操作人' }, + { prop: 'claim_status', label: '领料状态', tag: true }, + { prop: 'claim_operator_id', label: '领料操作人ID' }, + { prop: 'claim_operator', label: '领料操作人' }, { prop: 'grab_operator_id', label: '抢单操作人ID' }, { prop: 'grab_operator', label: '抢单操作人' }, { prop: 'lock_status', label: '锁定状态', tag: true }, @@ -1094,6 +1108,7 @@ export const orderDetailCompactSections: OrderDetailSectionConfig[] = [ { prop: 'pick_status', label: '拣货状态', tag: true }, { prop: 'pack_status', label: '打包状态', tag: true }, { prop: 'print_status', label: '打印状态', tag: true }, + { prop: 'confirm_print_status', label: '确认打印状态', tag: true }, { prop: 'intercept_status', label: '拦截状态', tag: true }, { prop: 'lock_status', label: '锁定状态', tag: true } ] @@ -1368,8 +1383,14 @@ export const inspectionStatusFilterOptions = [ ] export const claimStatusFilterOptions = [ - { label: '未认领', value: 'none' }, - { label: '已认领', value: 'fin' }, + { label: '未领料', value: 'none' }, + { label: '已领料', value: 'fin' }, +] + +/** 确认打印状态(订单 confirm_print_status):none=未确认打印 / fin=已确认打印 */ +export const confirmPrintStatusFilterOptions = [ + { label: '未确认打印', value: 'none' }, + { label: '已确认打印', value: 'fin' }, ] /** 锁定状态(待处理等订单页):只区分是否锁定。未锁定 = eq none,已锁定 = ne none(覆盖 warehouse/store 等所有非 none 值) */ @@ -1491,8 +1512,9 @@ export const postStatusScanField = scanWorkflowField({ label: '快递状态', va export const pickStatusScanField = scanWorkflowField({ label: '拣货状态', value: 'pick_status', type: 'select', options: pickStatusFilterOptions }) export const packStatusScanField = scanWorkflowField({ label: '打包状态', value: 'pack_status', type: 'select', options: packStatusFilterOptions }) export const printStatusScanField = scanWorkflowField({ label: '打印状态', value: 'print_status', type: 'select', options: printStatusFilterOptions }) +export const confirmPrintStatusScanField = scanWorkflowField({ label: '确认打印状态', value: 'confirm_print_status', type: 'select', options: confirmPrintStatusFilterOptions }) export const outboundStatusScanField = scanWorkflowField({ label: '数据归档', value: 'outbound_status', type: 'select', options: outboundStatusFilterOptions }) -export const claimStatusScanField = scanWorkflowField({ label: '认领状态', value: 'claim_status', type: 'select', options: claimStatusFilterOptions }) +export const claimStatusScanField = scanWorkflowField({ label: '领料状态', value: 'claim_status', type: 'select', options: claimStatusFilterOptions }) export const lockStatusScanField = scanWorkflowField({ label: '锁定状态', value: 'lock_status', type: 'select', options: lockStatusFilterOptions }) export const interceptStatusScanField = scanWorkflowField({ label: '拦截状态', value: 'intercept_status', type: 'select', options: interceptStatusFilterOptions }) /** 是否拦截(待处理 / 异常订单):否 = eq none,是 = ne none */ @@ -1636,6 +1658,7 @@ export const deliveryAvailableFields = [ { ...storageStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...postStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...printStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...confirmPrintStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...pickStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...packStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...claimStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, @@ -1723,9 +1746,10 @@ export const deliveryColumns = applyOrderListCopyActions([ { prop: 'storage_status', label: '储位状态', width: '90' }, { prop: 'post_status', label: '快递状态', width: '90' }, { prop: 'print_status', label: '打印状态', width: '100' }, + { prop: 'confirm_print_status', label: '确认打印状态', width: '110' }, { prop: 'pick_status', label: '拣货状态', width: '90' }, { prop: 'pack_status', label: '打包状态', width: '90' }, - { prop: 'claim_status', label: '认领状态', width: '100' }, + { prop: 'claim_status', label: '领料状态', width: '100' }, { prop: 'lock_status', label: '锁定状态', width: '100' }, { prop: 'intercept_status', label: '拦截状态', width: '100', tag: true }, { prop: 'logistics_name', label: '快递', width: '120' }, @@ -1998,6 +2022,8 @@ export const pendingAvailableFields = [ { ...pickStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...packStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...printStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...confirmPrintStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...claimStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...lockStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...interceptFlagScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...orderStatusScanField(pendingOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP }, @@ -2054,6 +2080,8 @@ export const ORDER_LIST_FIELD_LABELS: Record = { ...Object.fromEntries(pendingCloums.map((col) => [col.prop, col.label])), recheck_status: '复核状态', print_status: '打印状态', + confirm_print_status: '确认打印状态', + claim_status: '领料状态', outbound_status: '数据归档', inspection_status: '审核状态', order_code: '发货单号', @@ -2077,27 +2105,29 @@ export function applyOrderListColumnLabels>, + col: Record & { prop: string }, + afterProp: string +) { + if (source.some((item) => String(item?.prop || '') === col.prop)) return + const insertAfterIndex = source.findIndex((item) => String(item?.prop || '') === afterProp) + if (insertAfterIndex >= 0) { + source.splice(insertAfterIndex + 1, 0, col) + } else { + source.push(col) + } +} + +/** 待处理订单列表标准列:在基础列上补全复核、打印、确认打印、领料列 */ export function buildPendingStyleColumns(baseColumns: ReadonlyArray<{ prop: string; label: string; [key: string]: any }> = pendingCloums) { const source = applyOrderListColumnLabels(Array.isArray(baseColumns) ? [...baseColumns] : []) - const recheckColumn = { prop: 'recheck_status', label: ORDER_LIST_FIELD_LABELS.recheck_status, width: '100' } - if (!source.some((col) => String(col?.prop || '') === 'recheck_status')) { - const insertAfterIndex = source.findIndex((col) => String(col?.prop || '') === 'sync_status') - if (insertAfterIndex >= 0) { - source.splice(insertAfterIndex + 1, 0, recheckColumn) - } else { - source.push(recheckColumn) - } - } - if (!source.some((col) => String(col?.prop || '') === 'print_status')) { - const printColumn = { prop: 'print_status', label: ORDER_LIST_FIELD_LABELS.print_status, width: '100' } - const insertAfterIndex = source.findIndex((col) => String(col?.prop || '') === 'post_status') - if (insertAfterIndex >= 0) { - source.splice(insertAfterIndex + 1, 0, printColumn) - } else { - source.push(printColumn) - } - } + insertOrderColumnAfter(source, { prop: 'recheck_status', label: ORDER_LIST_FIELD_LABELS.recheck_status, width: '100' }, 'sync_status') + insertOrderColumnAfter(source, { prop: 'print_status', label: ORDER_LIST_FIELD_LABELS.print_status, width: '100' }, 'post_status') + // 确认打印紧接打印状态,领料紧随其后(三者同为一个打印/领料流程链) + insertOrderColumnAfter(source, { prop: 'confirm_print_status', label: ORDER_LIST_FIELD_LABELS.confirm_print_status, width: '110' }, 'print_status') + insertOrderColumnAfter(source, { prop: 'claim_status', label: ORDER_LIST_FIELD_LABELS.claim_status, width: '100' }, 'confirm_print_status') return applyOrderListCopyActions(source) } @@ -2388,6 +2418,8 @@ export const expectionOrderAvailableFields = [ { ...interceptFlagScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...recheckStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...printStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...confirmPrintStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...claimStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...lockStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...orderStatusScanField(exceptionOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP }, // 收货信息 diff --git a/src/views/order/orderManagement/deliveryOrder.vue b/src/views/order/orderManagement/deliveryOrder.vue index 233a97c6..2c22dcd1 100644 --- a/src/views/order/orderManagement/deliveryOrder.vue +++ b/src/views/order/orderManagement/deliveryOrder.vue @@ -85,6 +85,12 @@ + + + + + + + + + + + + + + + + + + + + + +