From d67cf55491333a9c3fc4549a8702be4cbb458188 Mon Sep 17 00:00:00 2001 From: weicw1996 Date: Thu, 22 Oct 2026 13:32:35 +0800 Subject: [PATCH 1/5] =?UTF-8?q?:sparkles:=20=E8=BF=90=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=94=AF=E6=8C=81=E5=BE=85=E5=9B=9E=E5=8D=95=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/option/business/common.js | 1 + src/views/business/components/waybill-manage-page.vue | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/option/business/common.js b/src/option/business/common.js index 8221c47..1d4c113 100644 --- a/src/option/business/common.js +++ b/src/option/business/common.js @@ -42,6 +42,7 @@ export const waybillStatusOptions = [ { label: '草稿', value: 'draft' }, { label: '待执行', value: 'pending' }, { label: '进行中', value: 'running' }, + { label: '待回单确认', value: 'pending_return_confirm' }, { label: '已完成', value: 'completed' }, { label: '已取消', value: 'cancelled' }, ]; diff --git a/src/views/business/components/waybill-manage-page.vue b/src/views/business/components/waybill-manage-page.vue index 77529db..6434ca1 100644 --- a/src/views/business/components/waybill-manage-page.vue +++ b/src/views/business/components/waybill-manage-page.vue @@ -5127,7 +5127,7 @@ export default { this.hasPermission(`${this.config.permission}_complete`) && !this.readonlyScope && !row.readonly && - this.statusValue(row) === 'running' + this.statusValue(row) === 'pending_return_confirm' ); }, canMaintainMileage(row) { @@ -6560,6 +6560,9 @@ export default { if (status === 'completed') { return 'primary'; } + if (['pending_return_confirm'].includes(status)) { + return 'warning'; + } return 'warning'; }, normalizeRow(row, saveAsDraft = false) { From 0889f29c593e8035850c71ecd7434582ab9407d5 Mon Sep 17 00:00:00 2001 From: weicw1996 Date: Thu, 22 Oct 2026 13:40:46 +0800 Subject: [PATCH 2/5] =?UTF-8?q?:bug:=20=E5=BE=85=E5=9B=9E=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E8=A1=A5=E9=BD=90=E5=89=8D=E7=AB=AF=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=90=8D=E7=A7=B0=E4=B8=8E=E6=A0=87=E7=AD=BE=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/option/business/waybill-manage.js | 2 ++ src/views/business/components/master-order-detail.vue | 4 ++-- src/views/business/components/transport-plan-page.vue | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) 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'], }; From 53b588063e77d595e07b930d3246a548abd109ee Mon Sep 17 00:00:00 2001 From: weicw1996 Date: Thu, 22 Oct 2026 13:42:43 +0800 Subject: [PATCH 3/5] =?UTF-8?q?:bug:=20=E5=BE=85=E5=9B=9E=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E8=BF=90=E5=8D=95=E6=94=AF=E6=8C=81=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=AB=AF=E5=AE=8C=E6=88=90=E4=B8=8E=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/components/waybill-manage-page.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/business/components/waybill-manage-page.vue b/src/views/business/components/waybill-manage-page.vue index 6434ca1..a6bd2d9 100644 --- a/src/views/business/components/waybill-manage-page.vue +++ b/src/views/business/components/waybill-manage-page.vue @@ -5107,7 +5107,8 @@ export default { return false; } const status = this.statusValue(row); - return status === 'pending'; + // 待回单确认可取消，取消不生成应收应付 + return status === 'pending' || status === 'pending_return_confirm'; }, canComplete(row) { if ( @@ -5119,7 +5120,8 @@ export default { return false; } const status = this.statusValue(row); - return status === 'processing' || status === 'running'; + // 待回单确认的管理端强制出口：确认回单之外也能直接完成 + return status === 'processing' || status === 'running' || status === 'pending_return_confirm'; }, canConfirmReturn(row) { return ( From 353148eb7f968c8d3e72782e6827c487bd351c98 Mon Sep 17 00:00:00 2001 From: weicw1996 Date: Thu, 22 Oct 2026 13:44:06 +0800 Subject: [PATCH 4/5] =?UTF-8?q?:bug:=20=E5=BE=85=E5=9B=9E=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E4=B8=8B=E6=8B=92=E7=BB=9D=E8=A1=A5=E5=BD=95?= =?UTF-8?q?=E6=89=93=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/components/waybill-manage-page.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/views/business/components/waybill-manage-page.vue b/src/views/business/components/waybill-manage-page.vue index 6434ca1..c5574e8 100644 --- a/src/views/business/components/waybill-manage-page.vue +++ b/src/views/business/components/waybill-manage-page.vue @@ -4378,9 +4378,15 @@ export default { addBtn: this.canCreate, }; }, - // 打卡记录编辑入口与运单编辑同权限：能改运单的人才能订正它的打卡流水 + // 打卡记录编辑入口与运单编辑同权限：能改运单的人才能订正它的打卡流水。 + // 待回单确认的运单司机已无待打卡节点，本入口只做补录/编辑（提交固定 punched=true）， + // 补录与状态含义矛盾；取消打卡不在本页，关掉入口不影响退回进行中。 canEditWaybillPunchRecord() { - return this.hasPermission(`${this.config.permission}_edit`) && !this.readonlyScope; + return ( + this.hasPermission(`${this.config.permission}_edit`) && + !this.readonlyScope && + this.statusValue(this.detailRow) !== 'pending_return_confirm' + ); }, waybillPunchEditNode() { return this.findWaybillPunchEditNodeConfig(this.waybillPunchEditRecord); From 59a1ca8a0d710f45b313cb82b96439e93ce072cc Mon Sep 17 00:00:00 2001 From: weicw1996 Date: Thu, 22 Oct 2026 14:39:50 +0800 Subject: [PATCH 5/5] =?UTF-8?q?:recycle:=20=E5=88=A0=E9=99=A4=E5=BE=85?= =?UTF-8?q?=E5=9B=9E=E5=8D=95=E7=A1=AE=E8=AE=A4=E6=A0=87=E7=AD=BE=E8=89=B2?= =?UTF-8?q?=E6=AD=BB=E5=88=86=E6=94=AF=E5=B9=B6=E8=AE=A2=E6=AD=A3=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/option/business/waybill-manage.js | 2 +- src/views/business/components/waybill-manage-page.vue | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/option/business/waybill-manage.js b/src/option/business/waybill-manage.js index 8ab15f0..e19a927 100644 --- a/src/option/business/waybill-manage.js +++ b/src/option/business/waybill-manage.js @@ -483,7 +483,7 @@ 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)) { diff --git a/src/views/business/components/waybill-manage-page.vue b/src/views/business/components/waybill-manage-page.vue index 9c241ec..ffe1610 100644 --- a/src/views/business/components/waybill-manage-page.vue +++ b/src/views/business/components/waybill-manage-page.vue @@ -4379,8 +4379,8 @@ export default { }; }, // 打卡记录编辑入口与运单编辑同权限：能改运单的人才能订正它的打卡流水。 - // 待回单确认的运单司机已无待打卡节点，本入口只做补录/编辑（提交固定 punched=true）， - // 补录与状态含义矛盾；取消打卡不在本页，关掉入口不影响退回进行中。 + // 时间轴的「编辑打卡 / 补卡」链接是本页唯一写入入口，提交固定 punched=true。 + // 取消打卡不在本页；待回单确认的运单不显示该链接。 canEditWaybillPunchRecord() { return ( this.hasPermission(`${this.config.permission}_edit`) && @@ -5126,7 +5126,7 @@ export default { return false; } const status = this.statusValue(row); - // 待回单确认的管理端强制出口：确认回单之外也能直接完成 + // 待回单确认也可直接完成，不经确认回单 return status === 'processing' || status === 'running' || status === 'pending_return_confirm'; }, canConfirmReturn(row) { @@ -6568,9 +6568,6 @@ export default { if (status === 'completed') { return 'primary'; } - if (['pending_return_confirm'].includes(status)) { - return 'warning'; - } return 'warning'; }, normalizeRow(row, saveAsDraft = false) {