新增配送阶段信息展示，优化订单和配送订单列表，增加相关字段和格式化函数。

shaofan
1 parent 2a496b6c
Showing 3 changed files with 76 additions and 0 deletions
.claude/settings.local.json
src/views/delivery/DeliveryOrderList.vue
src/views/order/OrderList.vue
+{
+  "permissions": {
+    "allow": [
+      "Bash(npm run *)"
+    ]
+  }
+}
@@ -32,6 +32,9 @@
           <template v-if="column.key === 'status'">
             <a-tag :color="statusColor[record.status]">{{ statusMap[record.status] }}</a-tag>
           </template>
+          <template v-if="column.key === 'deliveryStage'">
+            <a-tag :color="deliveryStageOf(record).color">{{ deliveryStageOf(record).text }}</a-tag>
+          </template>
           <template v-if="column.key === 'action'">
             <a-space>
               <a @click="openDetail(record)">详情</a>
@@ -56,9 +59,21 @@
           <a-descriptions-item label="配送订单号">{{ queryResult.orderNo }}</a-descriptions-item>
           <a-descriptions-item label="外部订单号">{{ queryResult.outOrderNo }}</a-descriptions-item>
           <a-descriptions-item label="状态">{{ statusMap[queryResult.status] }}</a-descriptions-item>
+          <a-descriptions-item label="配送阶段">
+            <a-tag :color="deliveryStageOf(queryResult).color">{{ deliveryStageOf(queryResult).text }}</a-tag>
+          </a-descriptions-item>
           <a-descriptions-item label="配送费">¥{{ queryResult.totalFee }}</a-descriptions-item>
           <a-descriptions-item label="距离">{{ queryResult.distance }} km</a-descriptions-item>
           <a-descriptions-item label="预计时间">{{ queryResult.estimatedMinutes }} 分钟</a-descriptions-item>
+          <a-descriptions-item label="骑手ID">{{ queryResult.riderId || '-' }}</a-descriptions-item>
+          <a-descriptions-item label="接单时间">{{ formatNodeTime(queryResult.grapTime) }}</a-descriptions-item>
+          <a-descriptions-item label="到店时间">{{ formatNodeTime(queryResult.arriveShopTime) }}</a-descriptions-item>
+          <a-descriptions-item label="到店位置">
+            {{ queryResult.arriveShopLng && queryResult.arriveShopLat ? `${queryResult.arriveShopLng}, ${queryResult.arriveShopLat}` : '-' }}
+          </a-descriptions-item>
+          <a-descriptions-item label="到店距离">{{ formatArriveDistance(queryResult.arriveShopDistance) }}</a-descriptions-item>
+          <a-descriptions-item label="取货时间">{{ formatNodeTime(queryResult.pickTime) }}</a-descriptions-item>
+          <a-descriptions-item label="完成时间">{{ formatNodeTime(queryResult.completeTime) }}</a-descriptions-item>
         </a-descriptions>
       </div>
     </a-modal>
@@ -106,6 +121,7 @@ const columns = computed(() =&gt; {
     { title: '收件人', dataIndex: 'recipName' },
     { title: '配送费', dataIndex: 'moneyDelivery' },
     { title: '状态', key: 'status' },
+    { title: '配送阶段', key: 'deliveryStage' },
     { title: '操作', key: 'action' },
   ]
   if (!isAdmin.value) {
@@ -204,6 +220,38 @@ async function cancelOrder(record: any) {
   await loadList()
 }
  
+function hasNodeTime(value: any) {
+  return value !== undefined && value !== null && value !== '' && Number(value) > 0
+}
+
+function deliveryStageOf(record: any) {
+  if (record.status === 3) {
+    return hasNodeTime(record.arriveShopTime)
+      ? { text: '已到店待取货', color: 'purple' }
+      : { text: '待到店', color: 'cyan' }
+  }
+  if (record.status === 4) return { text: '配送中', color: 'processing' }
+  if (record.status === 6) return { text: '已完成', color: 'green' }
+  if (record.status === 2) return { text: '待接单', color: 'blue' }
+  if (record.status === 10) return { text: '已取消', color: 'red' }
+  return { text: statusMap[record.status] || '-', color: 'default' }
+}
+
+function formatNodeTime(value: any) {
+  if (!hasNodeTime(value)) return '-'
+  if (typeof value === 'string' && Number.isNaN(Number(value))) return value
+  const date = new Date(Number(value) * 1000)
+  if (Number.isNaN(date.getTime())) return '-'
+  const pad = (n: number) => String(n).padStart(2, '0')
+  return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}`
+}
+
+function formatArriveDistance(value: any) {
+  if (value === undefined || value === null || value === '') return '-'
+  const meters = Number(value)
+  return Number.isFinite(meters) ? `${meters.toFixed(2)} 米` : '-'
+}
+
 onMounted(async () => {
   await loadCities()
   await loadList()
@@ -50,6 +50,9 @@
           <template v-if="column.key === 'status'">
             <a-tag :color="statusColor[record.status]">{{ statusMap[record.status] }}</a-tag>
           </template>
+          <template v-if="column.key === 'deliveryStage'">
+            <a-tag :color="deliveryStageOf(record).color">{{ deliveryStageOf(record).text }}</a-tag>
+          </template>
           <template v-if="column.key === 'isTrans'">
             <a-tag v-if="record.isTrans === 2" color="orange">申请中</a-tag>
             <a-tag v-else-if="record.isTrans === 1" color="blue">已转单</a-tag>
@@ -203,6 +206,7 @@ const columns = computed(() =&gt; {
     { title: 'ID', dataIndex: 'id', width: 80 },
     { title: '订单号', dataIndex: 'orderNo', ellipsis: true },
     { title: '状态', key: 'status' },
+    { title: '配送阶段', key: 'deliveryStage' },
     { title: '骑手ID', dataIndex: 'riderId' },
     { title: '转单', key: 'isTrans' },
     { title: '配送费', dataIndex: 'moneyDelivery' },
@@ -362,6 +366,23 @@ async function handleRefund(status: number) {
   } finally { saving.value = false }
 }
  
+function hasNodeTime(value: any) {
+  return value !== undefined && value !== null && value !== '' && Number(value) > 0
+}
+
+function deliveryStageOf(record: any) {
+  if (record.status === 3) {
+    return hasNodeTime(record.arriveShopTime)
+      ? { text: '已到店待取货', color: 'purple' }
+      : { text: '待到店', color: 'cyan' }
+  }
+  if (record.status === 4) return { text: '配送中', color: 'processing' }
+  if (record.status === 6) return { text: '已完成', color: 'green' }
+  if (record.status === 2) return { text: '待接单', color: 'blue' }
+  if (record.status === 10) return { text: '已取消', color: 'red' }
+  return { text: statusMap[record.status] || '-', color: 'default' }
+}
+
 onMounted(async () => {
   await loadCities()
   await loadList()