diff --git a/src/api/glt/gltTicketOrder/model/index.ts b/src/api/glt/gltTicketOrder/model/index.ts index 73e1213..978f430 100644 --- a/src/api/glt/gltTicketOrder/model/index.ts +++ b/src/api/glt/gltTicketOrder/model/index.ts @@ -50,6 +50,12 @@ export interface GltTicketOrder { tenantId?: number; // 创建时间 createTime?: string; + // 派送时间(后端可能返回该字段用于派单/出库时间) + sendTime?: string; + // 送达时间 + arriveTime?: string; + // 签收时间 + signTime?: string; // 修改时间 updateTime?: string; } diff --git a/src/views/glt/gltTicketOrder/index.vue b/src/views/glt/gltTicketOrder/index.vue index e1e66ea..bc1565d 100644 --- a/src/views/glt/gltTicketOrder/index.vue +++ b/src/views/glt/gltTicketOrder/index.vue @@ -44,8 +44,16 @@ - 配送时间:{{ record.sendTime || '-' }} - 配送人员:{{ record.riderName || '-' }} 指派 + + 配送人员:{{ record.riderName || '-' }} + + 指派 + + 联系电话:{{ record.riderPhone || '-' }} @@ -54,18 +62,25 @@ - 待配送 - 已派送 - 已送达 - 已签收 + + {{ getOrderStatus(record).label }} + - + - 下单时间:{{ record.createTime }} - 派送时间:{{ record.updateTime }} - 送达时间:{{ record.createTime }} - 签收时间:{{ record.updateTime }} + + 下单时间:{{ formatTime(getOrderTimes(record).orderTime) }} + + + 派送时间:{{ formatTime(getOrderTimes(record).sendTime) }} + + + 送达时间:{{ formatTime(getOrderTimes(record).arriveTime) }} + + + 签收时间:{{ formatTime(getOrderTimes(record).signTime) }} + @@ -85,13 +100,53 @@ + + + + + + {{ assignRow?.riderName || '-' }} + + ({{ assignRow?.riderPhone }}) + + + + + + + + +