diff --git a/src/option/business/waybill-manage.js b/src/option/business/waybill-manage.js index a86078d..8ab15f0 100644 --- a/src/option/business/waybill-manage.js +++ b/src/option/business/waybill-manage.js @@ -483,6 +483,8 @@ export const config = { row.requireAccept === true || row.requireAccept === 1 || requiresDriverAcceptConfirmation(row); + // 待回单确认由末位打卡产生,司机必然已接单,先于下面的接单校正返回 + if (status === 'pending_return_confirm') return '待回单确认'; // 需司机接单且尚未接单 → 待执行(含库中仍为 running 的历史数据展示校正) if (needAccept && !hasDriverAcceptRecord(row) && !terminalStatuses.includes(status)) { return '待执行'; diff --git a/src/views/business/components/master-order-detail.vue b/src/views/business/components/master-order-detail.vue index f40e339..c59f4c2 100644 --- a/src/views/business/components/master-order-detail.vue +++ b/src/views/business/components/master-order-detail.vue @@ -294,8 +294,8 @@ export default { query: { id: String(customerId), name: '查看客商档案', view: '1' }, }); }, - waybillStatusName(value) { return ({ pending: '待执行', waiting: '待执行', running: '进行中', processing: '进行中', completed: '已完成', cancelled: '已取消' })[value] || value || '-'; }, - waybillStatusType(value) { return ({ pending: 'info', waiting: 'info', running: 'warning', processing: 'warning', completed: 'success', cancelled: 'danger' })[value] || 'info'; }, + waybillStatusName(value) { return ({ pending: '待执行', waiting: '待执行', running: '进行中', processing: '进行中', pending_return_confirm: '待回单确认', completed: '已完成', cancelled: '已取消' })[value] || value || '-'; }, + waybillStatusType(value) { return ({ pending: 'info', waiting: 'info', running: 'warning', processing: 'warning', pending_return_confirm: 'warning', completed: 'success', cancelled: 'danger' })[value] || 'info'; }, statusName(value) { return ({ waiting_dispatch: '待调度', dispatching: '调度中', completed: '调度完成', closed: '调度关闭' })[value] || value || '-'; }, statusType(value) { return ({ waiting_dispatch: 'warning', dispatching: 'success', completed: 'primary', closed: 'danger' })[value] || 'info'; }, }, diff --git a/src/views/business/components/transport-plan-page.vue b/src/views/business/components/transport-plan-page.vue index e4af27c..f77891a 100644 --- a/src/views/business/components/transport-plan-page.vue +++ b/src/views/business/components/transport-plan-page.vue @@ -4184,6 +4184,7 @@ export default { waiting: ['待执行', 'is-pending'], processing: ['进行中', 'is-processing'], running: ['进行中', 'is-processing'], + pending_return_confirm: ['待回单确认', 'is-pending'], completed: ['已完成', 'is-completed'], cancelled: ['已取消', 'is-cancelled'], };