From c7b07f0c95f6a93efe12f138b931c988adb2a4b7 Mon Sep 17 00:00:00 2001
From: weicw <594098497@qq.com>
Date: Tue, 27 Oct 2026 08:17:52 +0800
Subject: [PATCH] =?UTF-8?q?:lipstick:=20=E8=BF=90=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=BE=85=E5=9B=9E=E5=8D=95=E7=A1=AE=E8=AE=A4=E7=9A=84?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=96=87=E6=A1=88=E6=94=B9=E4=B8=BA=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/components/waybill-manage-page.vue  | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/views/business/components/waybill-manage-page.vue b/src/views/business/components/waybill-manage-page.vue
index 421caed..e1dd0f9 100644
--- a/src/views/business/components/waybill-manage-page.vue
+++ b/src/views/business/components/waybill-manage-page.vue
@@ -1607,7 +1607,7 @@
             v-if="canConfirmReturn(row)"
             @click="handleAction('confirmReturn', row)"
           >
-            确认回单
+            {{ completeActionLabel }}
           </el-link>
           <el-link type="primary" v-if="canMaintainMileage(row)" @click="openMileageDialog(row)">
             维护里程
@@ -5168,8 +5168,12 @@ export default {
         return false;
       }
       const status = this.statusValue(row);
-      // 待回单确认也可直接完成，不经确认回单
-      return status === 'processing' || status === 'running' || status === 'pending_return_confirm';
+      // 待回单确认的「完成」由确认回单入口承担（走打卡节点与未了结异常校验）；
+      // 只有确认回单不可用时才退回这里的普通完成
+      if (status === 'pending_return_confirm') {
+        return !this.canConfirmReturn(row);
+      }
+      return status === 'processing' || status === 'running';
     },
     canConfirmReturn(row) {
       return (
@@ -10215,12 +10219,12 @@ export default {
         cancel: '取消',
         complete: this.completeActionLabel,
         reassign: '重新派单',
-        confirmReturn: '确认回单',
+        confirmReturn: '完成',
       }[action];
-      // 确认回单是终态动作（本轮不做撤销），把后果写在提示里，别让人以为还能退回
+      // 回单确认是终态动作（本轮不做撤销），把后果写在提示里，别让人以为还能退回
       const confirmText =
         action === 'confirmReturn'
-          ? '确认回单后该运单将置为已完成，且不可撤销。是否继续?'
+          ? '回单确认后该运单将置为已完成，且不可撤销。是否继续?'
           : `确定${actionName}该${this.config.title}?`;
       this.$confirm(confirmText, '提示', {
         confirmButtonText: '确定',