提交

web-admin/src/composables/usePlPlanArrangeActions.ts

@@ -9,6 +9,7 @@ import { planApi } from '@/api/pl'
 import DbPoundSlipQrcodeDialog from '@/components/business/db/DbPoundSlipQrcodeDialog.vue'
 import { useDictStore } from '@/store/modules/dict'
 import { formatDate } from '@/utils/format'
+import { appendAmapNavLine, buildAmapNavigationUrl } from '@/utils/amap/navigation'
 import { pickBxData } from '@/utils/http/bx'
 import { formatPlanProductListText } from '@/utils/pl-display'
 import { buildSiteSummaryFromInventoryLinks } from '@/utils/db-site-summary'
@@ -109,7 +110,11 @@ export function usePlPlanArrangeActions() {
     startPoint?: string
     endPoint?: string
     pickupAddress?: string
+    pickupLng?: number | null
+    pickupLat?: number | null
     destinationAddress?: string
+    destinationLng?: number | null
+    destinationLat?: number | null
     pickupNotes?: string
     destinationNotes?: string
     licensePlate?: string
@@ -124,15 +129,37 @@ export function usePlPlanArrangeActions() {
       .map(p => formatPlanProductListText(p, getUnitLabel, { usePlannedQuantity: true }))
       .join('；')
     lines.push(`产品：${productText || '—'}`)
-    lines.push(
-      `路线：${options?.pickupAddress || plan.value?.pickupAddress || options?.startPoint || '—'} → ${
-        options?.destinationAddress ||
-        plan.value?.destinationAddress ||
-        plan.value?.destinationName ||
-        options?.endPoint ||
-        '—'
-      }`
+
+    const pickupAddress =
+      options?.pickupAddress || plan.value?.pickupAddress || options?.startPoint || '—'
+    const destinationAddress =
+      options?.destinationAddress ||
+      plan.value?.destinationAddress ||
+      plan.value?.destinationName ||
+      options?.endPoint ||
+      '—'
+    lines.push(`取货地址：${pickupAddress}`)
+    lines.push(`送货地址：${destinationAddress}`)
+
+    const pickupLng = options?.pickupLng ?? plan.value?.pickupLng
+    const pickupLat = options?.pickupLat ?? plan.value?.pickupLat
+    const destinationLng = options?.destinationLng ?? plan.value?.destinationLng
+    const destinationLat = options?.destinationLat ?? plan.value?.destinationLat
+    appendAmapNavLine(
+      lines,
+      '取货导航',
+      buildAmapNavigationUrl(pickupLng, pickupLat, pickupAddress !== '—' ? pickupAddress : '取货点')
     )
+    appendAmapNavLine(
+      lines,
+      '送货导航',
+      buildAmapNavigationUrl(
+        destinationLng,
+        destinationLat,
+        destinationAddress !== '—' ? destinationAddress : '送货点'
+      )
+    )
+
     lines.push(`取货注意事项：${options?.pickupNotes || plan.value?.pickupNotes || '—'}`)
     lines.push(`送货注意事项：${options?.destinationNotes || plan.value?.destinationNotes || '—'}`)
     lines.push(`司机链接：${options?.driverUrl || driverUrl.value || '—'}`)
@@ -208,7 +235,11 @@ export function usePlPlanArrangeActions() {
     startPoint?: string
     endPoint?: string
     pickupAddress?: string
+    pickupLng?: number | null
+    pickupLat?: number | null
     destinationAddress?: string
+    destinationLng?: number | null
+    destinationLat?: number | null
     pickupNotes?: string
     destinationNotes?: string
     licensePlate?: string