From b933020bf8da90e373e25ae3e1fc1311e3998697 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Fri, 6 Feb 2026 22:16:26 +0800
Subject: [PATCH] =?UTF-8?q?feat(gltTicketOrder):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=85=8D=E9=80=81=E7=8A=B6=E6=80=81=E5=92=8C=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在订单模型中新增配送状态字段（deliveryStatus）、派送完成图片（sendEndImg）、收货确认时间和收货确认类型
- 更新骑手数据显示逻辑，增加配送时间和留档图片展示
- 修正骑手列表选择逻辑，使用userId替代id进行匹配
- 注释掉订单状态列显示以优化界面布局
---
 src/api/glt/gltTicketOrder/model/index.ts |  8 ++++++++
 src/views/glt/gltTicketOrder/index.vue    | 22 ++++++++++++----------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/api/glt/gltTicketOrder/model/index.ts b/src/api/glt/gltTicketOrder/model/index.ts
index 978f430..cc4b0f4 100644
--- a/src/api/glt/gltTicketOrder/model/index.ts
+++ b/src/api/glt/gltTicketOrder/model/index.ts
@@ -50,12 +50,20 @@ export interface GltTicketOrder {
   tenantId?: number;
   // 创建时间
   createTime?: string;
+  // 配送状态：10待配送、20配送中、30待客户确认、40已完成
+  deliveryStatus?: number;
   // 派送时间（后端可能返回该字段用于派单/出库时间）
   sendTime?: string;
   // 送达时间
   arriveTime?: string;
   // 签收时间
   signTime?: string;
+  // 派送完成图片
+  sendEndImg?: string;
+  // 收货确认图片
+  receiveConfirmTime?: string;
+  // 收货确认类型(10手动、20照片、30超时)
+  receiveConfirmType?: number;
   // 修改时间
   updateTime?: string;
 }
diff --git a/src/views/glt/gltTicketOrder/index.vue b/src/views/glt/gltTicketOrder/index.vue
index bc1565d..f50e540 100644
--- a/src/views/glt/gltTicketOrder/index.vue
+++ b/src/views/glt/gltTicketOrder/index.vue
@@ -44,7 +44,8 @@
             <template v-if="column.key === 'riderName'">
               <a-space>
                 <div class="flex flex-col">
-                  <div class="text-gray-400 flex justify-between">
+                  <div class="text-gray-400">配送时间：{{ record.sendTime || '-'}}</div>
+                  <div class="text-gray-400 flex justify-between" style="min-width: 224px">
                     配送人员：{{ record.riderName || '-' }}
                     <a-tag
                       color="blue"
@@ -55,6 +56,7 @@
                     </a-tag>
                   </div>
                   <div class="text-blue-400">联系电话：{{ record.riderPhone || '-' }}</div>
+                  <div class="text-gray-400">留档图片：{{ record.sendEndImg || '-' }}</div>
                 </div>
               </a-space>
             </template>
@@ -202,11 +204,11 @@
     return (riderList.value || []).map((r) => {
       const label = `${r.realName || '-'}${r.mobile ? `（${r.mobile}）` : ''}`;
       return {
-        value: r.id,
+        value: r.userId,
         label,
         disabled:
           r.status === 0 ||
-          (currentRiderId != null && String(r.id ?? '') === String(currentRiderId))
+          (currentRiderId != null && String(r.userId ?? '') === String(currentRiderId))
       };
     });
   });
@@ -398,13 +400,13 @@
       width: 260,
       align: 'center'
     },
-    {
-      title: '状态',
-      dataIndex: 'status',
-      key: 'status',
-      align: 'center',
-      width: 120
-    }
+    // {
+    //   title: '状态',
+    //   dataIndex: 'status',
+    //   key: 'status',
+    //   align: 'center',
+    //   width: 120
+    // }
     // {
     //   title: '操作',
     //   key: 'action',