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 @@ @@ -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',