diff --git a/src/views/order/orderreview/component/RecheckOrderPanel.vue b/src/views/order/orderreview/component/RecheckOrderPanel.vue index c25a5ec4..14422aad 100644 --- a/src/views/order/orderreview/component/RecheckOrderPanel.vue +++ b/src/views/order/orderreview/component/RecheckOrderPanel.vue @@ -283,6 +283,11 @@ function getOrderIsReviewed(order: any): boolean { } function getOrderIsPrinted(order: any): boolean { + // 团购单:unprinted_count === 0 表示全部已打印 + const unprinted = (order as any)?.unprinted_count + if (unprinted !== undefined && unprinted !== null) { + return Number(unprinted) === 0 + } const field = props.isPrintedField const val = field.split('.').reduce((obj: any, key: string) => obj?.[key], order) if (val === true || val === 'true' || val === 1 || val === '1') return true diff --git a/src/views/order/orderreview/index.vue b/src/views/order/orderreview/index.vue index 397cf6e8..2d384a2a 100644 --- a/src/views/order/orderreview/index.vue +++ b/src/views/order/orderreview/index.vue @@ -433,9 +433,14 @@ function handlePanelSearch(keyword: string) { void executeScan({ keyword }) } -/** 判断订单是否已打印面单(兼容 print_status 与 is_printed 两种字段) */ +/** 判断订单是否已打印面单(兼容 print_status、is_printed、unprinted_count 字段) */ function isOrderAlreadyPrinted(order: any): boolean { if (!order) return false + // 团购单:unprinted_count === 0 表示全部已打印 + const unprinted = order.unprinted_count + if (unprinted !== undefined && unprinted !== null) { + return Number(unprinted) === 0 + } // 优先检查 print_status if (String(order.print_status ?? '').trim() === 'fin') return true // 其次检查 is_printed 布尔/数字字段