优化

src/modules/overseas-warehouse/pages/LastMileOrdersView.vue

@@ -21,7 +21,7 @@ import { businessOrderLink } from '../businessOrderLink'
 import OrderReferenceText from '../components/OrderReferenceText.vue'
 import { reviewCargoDiscard } from '../api/lastMileOrders'
 import WarehouseTransferReviewDialog from '../components/WarehouseTransferReviewDialog.vue'
-import { confirmRelabelCompletion, createReturnPackingPlan, getRelabelReviewTask, returnRelabelForRework, type ReturnPackingPlanBox } from '../api/relabelOrders'
+import { confirmRelabelCompletion, getRelabelReviewTask, returnRelabelForRework } from '../api/relabelOrders'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { overseasWarehousePermissions as permission } from '../permissions'
 import { lastMileStatusLabel, packageDifferenceText, toLastMileOrderListItem } from '../lastMilePresentation'
@@ -49,34 +49,20 @@ const containerDetail = ref<ContainerPlanProgressDetailDto | null>(null)
 const transferReviewOpen = ref(false)
 const transferReviewTarget = ref<LastMileOrderListItem | null>(null)
 const selectedRows = ref<LastMileOrderListItem[]>([])
-const packingPlanOpen = ref(false)
-const packingPlanLoading = ref(false)
-const packingPlanMode = ref<'CUSTOMER_INSTRUCTION' | 'WAREHOUSE_RECOMMENDATION'>('CUSTOMER_INSTRUCTION')
-const packingPlanRemark = ref('')
-const packingPlanBoxes = ref<ReturnPackingPlanBox[]>([])
-const selectedReturnRows = computed(() => selectedRows.value.filter((row) => row.orderTypeCode === 'RETURN_RELABEL' && ['COMPLETED', 'RECEIVED', 'IN_WAREHOUSE', '已完成入库'].includes(String(row.currentStatusCode || row.status || ''))))
+const selectedReturnRows = computed(() => selectedRows.value.filter((row) => row.orderTypeCode === 'RETURN_RELABEL' && ['INBOUND_COMPLETED', 'COMPLETED', 'RECEIVED', 'IN_WAREHOUSE', '已完成入库'].includes(String(row.currentStatusCode || row.status || ''))))
 function openReturnPackingPlan() {
-  if (!selectedReturnRows.value.length) { ElMessage.warning('请勾选已入库的退货订单'); return }
-  packingPlanMode.value = 'CUSTOMER_INSTRUCTION'; packingPlanRemark.value = ''
-  packingPlanBoxes.value = [{ boxNo: 1, items: [{ skuCode: '', quantity: 0 }] }]
-  packingPlanOpen.value = true
+  const selected = selectedReturnRows.value
+  if (!selected.length) { ElMessage.warning('请勾选已入库的退货订单'); return }
+  if (new Set(selected.map(row => row.customerId)).size !== 1 || new Set(selected.map(row => row.overseasWarehouseId)).size !== 1) {
+    ElMessage.warning('合箱请选择同一客户、同一海外仓的退货订单'); return
+  }
+  void router.push({ name: 'overseas-return-inventory', query: {
+    packing: '1', customerId: selected[0]!.customerId, overseasWarehouseId: selected[0]!.overseasWarehouseId,
+    returnNos: selected.map(row => row.sourceOrderNo || row.orderNo).join(','),
+  } })
 }
-function addReturnPackingBox() { packingPlanBoxes.value.push({ boxNo: packingPlanBoxes.value.length + 1, items: [{ skuCode: '', quantity: 0 }] }) }
-function removeReturnPackingBox(index: number) { if (packingPlanBoxes.value.length > 1) packingPlanBoxes.value.splice(index, 1) }
-function addReturnPackingItem(box: ReturnPackingPlanBox) { box.items.push({ skuCode: '', quantity: 0 }) }
-function removeReturnPackingItem(box: ReturnPackingPlanBox, index: number) { if (box.items.length > 1) box.items.splice(index, 1) }
-async function submitReturnPackingPlan() {
-  const boxes = packingPlanBoxes.value.map((box) => ({ ...box, items: box.items.filter((item) => item.skuCode.trim() && Number(item.quantity) > 0) })).filter((box) => box.items.length)
-  if (!boxes.length) { ElMessage.warning('至少配置一个目标箱'); return }
-  packingPlanLoading.value = true
-  try {
-    const result = await createReturnPackingPlan({ returnNos: selectedReturnRows.value.map((row) => String(row.sourceOrderNo || row.orderNo)).filter(Boolean), mode: packingPlanMode.value, boxes, remark: packingPlanRemark.value.trim() || undefined, idempotencyKey: globalThis.crypto?.randomUUID?.() || `return-packing-${Date.now()}` })
-    ElMessage.success(`合箱计划 ${result.planNo} 已推送 PDA`); packingPlanOpen.value = false; selectedRows.value = []
-  } catch (error) { ElMessage.error(getApiErrorDetails(error, '合箱计划推送失败，请重试').message) }
-  finally { packingPlanLoading.value = false }
-}
-const actionLoading = ref(false)
 const exportLoading = ref(false)
+const actionLoading = ref(false)
 async function exportOrders() { exportLoading.value = true; try { await submitExport('LAST_MILE_ORDER_LIST', '尾程订单', orderQuery()) } catch (cause) { ElMessage.error(getApiErrorDetails(cause, '尾程订单导出失败，请重试').message) } finally { exportLoading.value = false } }
 const actionError = ref<ApiErrorDetails | null>(null)
 const actionTarget = ref<LastMileOrderListItem | null>(null)
@@ -1132,7 +1118,6 @@ onMounted(() => { void load() })
       <template #pagination-left>共 {{ total }} 条尾程订单 · 已选 {{ selectedRows.length }} 条</template>
     </DataTable>
   </ListPageLayout></AdminPage>
-  <AppDialog class="admin-density-dialog" v-model="packingPlanOpen" title="退货合箱计划" width="min(980px, calc(100vw - 28px))" confirm-text="推送 PDA" :confirm-loading="packingPlanLoading" @confirm="submitReturnPackingPlan"><el-radio-group v-model="packingPlanMode"><el-radio-button label="CUSTOMER_INSTRUCTION">客户合箱指令</el-radio-button><el-radio-button label="WAREHOUSE_RECOMMENDATION">仓库自主合箱</el-radio-button></el-radio-group><div v-for="(box, index) in packingPlanBoxes" :key="index" class="packing-box"><div class="packing-box-head"><strong>第 {{ index + 1 }} 箱</strong><el-button text type="danger" @click="removeReturnPackingBox(index)">删除箱</el-button></div><div v-for="(item, itemIndex) in box.items" :key="itemIndex" class="packing-item"><el-input v-model="item.skuCode" placeholder="SKU" /><el-input-number v-model="item.quantity" :min="0" :precision="0" placeholder="数量" /><el-button text type="danger" @click="removeReturnPackingItem(box, itemIndex)">移除</el-button></div><el-button text type="primary" @click="addReturnPackingItem(box)">+ 添加 SKU</el-button></div><el-button plain type="primary" @click="addReturnPackingBox">+ 添加箱</el-button><el-input v-model="packingPlanRemark" type="textarea" :rows="2" placeholder="合箱备注（选填）" /></AppDialog>
   <WarehouseTransferReviewDialog v-if="transferReviewTarget" v-model="transferReviewOpen" :customer-id="transferReviewTarget.customerId" :customer-name="transferReviewTarget.owner" :transfer-no="transferReviewTarget.orderNo" @reviewed="load()" />
   <AppDialog class="admin-density-dialog" v-model="transferOpen" title="转仓" confirm-text="确认转仓" :loading="transferWarehouseLoading" :confirm-loading="actionLoading" :confirm-disabled="!transferForm.warehouseId || Boolean(transferWarehouseError)" @confirm="submitTransfer">
     <LoadErrorState v-if="transferWarehouseError" title="FBA 仓候选加载失败" :message="transferWarehouseError.message" compact @retry="loadTransferWarehouseOptions">