From 59a1ca8a0d710f45b313cb82b96439e93ce072cc Mon Sep 17 00:00:00 2001
From: weicw1996 <weicw1996@qq.com>
Date: Thu, 22 Oct 2026 14:39:50 +0800
Subject: [PATCH] =?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) {