优化

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

@@ -12,7 +12,7 @@ import ListPageLayout from '@/shared/components/ListPageLayout.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import OperationErrorToast from '@/shared/components/OperationErrorToast.vue'
 import QueryToolbar, { type QueryField, type QueryModel } from '@/shared/components/QueryToolbar.vue'
-import { convertLastMileContainerToInboundPlans, listLastMileOrders, listPendingContainerSummaries, transferLastMileOrders, type PendingContainerSummaryDto } from '../api/lastMileOrders'
+import { convertLastMileContainerToInboundPlans, convertLastMileOrderToInboundPlan, listLastMileOrders, listPendingContainerSummaries, transferLastMileOrders, type PendingContainerSummaryDto } from '../api/lastMileOrders'
 import OrderReferenceText from '../components/OrderReferenceText.vue'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { overseasWarehousePermissions as permission } from '../permissions'
@@ -27,13 +27,17 @@ const router = useRouter()
 const page = ref(1)
 const pageSize = ref(10)
 const total = ref(0)
-const containerTotal = ref(0)
 const selectedRows = ref<LastMileOrderListItem[]>([])
-const containerRows = ref<PendingContainerSummaryDto[]>([])
 const actionLoading = ref(false)
 const actionError = ref<ApiErrorDetails | null>(null)
 const transferOpen = ref(false)
 const transferForm = reactive({ warehouseId: '', warehouseCode: '', warehouseName: '', remark: '' })
+const containerConvertOpen = ref(false)
+const containerOptions = ref<PendingContainerSummaryDto[]>([])
+const containerOptionsLoading = ref(false)
+const containerLoadError = ref<ApiErrorDetails | null>(null)
+const selectedContainerBookingId = ref('')
+let containerOptionRequest = 0
 const statusTab = ref<'全部' | '待分配'>('全部')
 const filters = ref<QueryModel>({ orderNo: '', orderType: '', warehouse: '', inboundCode: '', sourceOrderNo: '', containerNo: '', status: '', transferWarehouseCode: '', abnormal: '', detained: '', createdAt: [] })
 const allFields: QueryField[] = [
@@ -60,9 +64,8 @@ const allFields: QueryField[] = [
   { key: 'detained', type: 'select', label: '是否暂扣', placeholder: '全部', options: [{ label: '是', value: 'true' }, { label: '否', value: 'false' }] },
   { key: 'createdAt', type: 'daterange', label: '创建时间' },
 ]
-const fields = computed(() => statusTab.value === '待分配'
-  ? allFields.filter((field) => ['containerNo', 'createdAt'].includes(field.key))
-  : allFields)
+const fields = computed<QueryField[]>(() => allFields)
+const selectedContainer = computed(() => containerOptions.value.find((row) => row.sourceContainerBookingId === selectedContainerBookingId.value))
 const columns: DataTableColumn[] = [
   { key: 'actions', label: '操作', width: 110, fixed: 'left', slotName: 'actions' },
   { key: 'selection', type: 'selection', width: 48, fixed: 'left' },
@@ -98,45 +101,10 @@ const columns: DataTableColumn[] = [
   { key: 'customerRemark', prop: 'customerRemark', label: '备注(客户)', minWidth: 160 },
   { key: 'warehouseRemark', prop: 'warehouseRemark', label: '备注(仓库)', minWidth: 160 },
 ]
-const containerColumns: DataTableColumn[] = [
-  { key: 'actions', label: '操作', width: 190, fixed: 'left', slotName: 'actions' },
-  { key: 'containerNo', prop: 'containerNo', label: '柜号', minWidth: 180 },
-  { key: 'orderCount', prop: 'orderCount', label: '订单数', width: 90, align: 'right' },
-  { key: 'inboundCodeCount', prop: 'inboundCodeCount', label: '入仓码数', width: 100, align: 'right' },
-  { key: 'customerCount', prop: 'customerCount', label: '客户数', width: 90, align: 'right' },
-  { key: 'totalPackageCount', prop: 'totalPackageCount', label: '总箱数', width: 100, align: 'right' },
-  { key: 'totalPalletCount', prop: 'totalPalletCount', label: '总托数', width: 100, align: 'right' },
-  { key: 'totalVolumeCbm', prop: 'totalVolumeCbm', label: '总体积(m³)', width: 120, align: 'right' },
-  { key: 'eligibility', prop: 'eligibility', label: '资格', minWidth: 160, slotName: 'eligibility' },
-  { key: 'planNotice', label: '生成说明', minWidth: 320, slotName: 'planNotice' },
-]
-
 async function load(model: QueryModel = filters.value) {
   Object.assign(filters.value, model)
   loading.value = true
   loadError.value = null
-  if (statusTab.value === '待分配') {
-    rows.value = []
-    const dateRange = Array.isArray(filters.value.createdAt) ? filters.value.createdAt.map(String) : []
-    try {
-      const result = await listPendingContainerSummaries({
-        page: page.value,
-        size: pageSize.value,
-        containerNo: String(filters.value.containerNo || '').trim() || undefined,
-        createdFrom: dateRange[0] ? `${dateRange[0]}T00:00:00` : undefined,
-        createdTo: dateRange[1] ? `${dateRange[1]}T23:59:59` : undefined,
-      })
-      containerRows.value = result.records
-      containerTotal.value = result.total
-    } catch (error) {
-      containerRows.value = []
-      containerTotal.value = 0
-      loadError.value = getApiErrorDetails(error, '柜级待分配摘要加载失败，请重试')
-    } finally {
-      loading.value = false
-    }
-    return
-  }
   try {
     const dateRange = Array.isArray(filters.value.createdAt) ? filters.value.createdAt.map(String) : []
     const booleanValue = (value: unknown) => value === 'true' ? true : value === 'false' ? false : undefined
@@ -149,7 +117,7 @@ async function load(model: QueryModel = filters.value) {
       inboundCode: String(filters.value.inboundCode || '').trim() || undefined,
       sourceOrderNo: String(filters.value.sourceOrderNo || '').trim() || undefined,
       containerNo: String(filters.value.containerNo || '').trim() || undefined,
-      currentStatus: String(filters.value.status || '').trim() || undefined,
+      currentStatus: statusTab.value === '待分配' ? 'PENDING_ASSIGNMENT' : String(filters.value.status || '').trim() || undefined,
       transferWarehouseCode: String(filters.value.transferWarehouseCode || '').trim() || undefined,
       abnormal: booleanValue(filters.value.abnormal),
       detained: booleanValue(filters.value.detained),
@@ -171,7 +139,11 @@ async function load(model: QueryModel = filters.value) {
 
 function search(model: QueryModel) { page.value = 1; void load(model) }
 function reset(model: QueryModel) { page.value = 1; void load(model) }
-function changeStatusTab() { selectedRows.value = []; page.value = 1; void load() }
+function changeStatusTab() {
+  selectedRows.value = []
+  page.value = 1
+  void load()
+}
 function onSelectionChange(selection: object[]) { selectedRows.value = selection as LastMileOrderListItem[] }
 function openTransfer() {
   if (!selectedRows.value.length) { ElMessage.warning('请至少选择 1 条尾程订单'); return }
@@ -191,24 +163,69 @@ async function submitTransfer() {
   } catch (error) { actionError.value = getApiErrorDetails(error, '转仓失败，请重试') }
   finally { actionLoading.value = false }
 }
-async function generateContainerInboundPlans(row: PendingContainerSummaryDto) {
-  if (!row.eligible) {
-    actionError.value = { message: row.ineligibleReason || '当前整柜不满足生成资格' }
-    return
-  }
-  if (!row.sourceContainerBookingId) {
-    actionError.value = { message: '所选整柜缺少稳定来源柜身份，无法安全生成入库计划' }
+async function convertInboundPlan() {
+  if (selectedRows.value.length !== 1) { ElMessage.warning('生成入库计划时请选择 1 条尾程订单'); return }
+  const selected = selectedRows.value[0]
+  const customerId = typeof selected.customerId === 'string' ? selected.customerId.trim() : ''
+  if (!customerId) {
+    actionError.value = { message: '所选尾程订单缺少客户标识，无法安全生成入库计划' }
     return
   }
   actionLoading.value = true
   actionError.value = null
   try {
-    const plans = await convertLastMileContainerToInboundPlans({ sourceContainerBookingId: row.sourceContainerBookingId })
-    if (plans.length !== row.orderCount) {
-      actionError.value = { message: `柜级接口返回 ${plans.length} 个计划，与所选整柜 ${row.orderCount} 个尾程订单不一致` }
-      return
-    }
-    ElMessage.success(`已为${row.orderCount}个尾程订单生成${plans.length}个入库计划`)
+    await convertLastMileOrderToInboundPlan({ orderId: String(selected.id), customerId })
+    selectedRows.value = []
+    ElMessage.success('入库计划生成成功')
+    await load()
+  } catch (error) {
+    actionError.value = getApiErrorDetails(error, '生成入库计划失败，请重试')
+  } finally {
+    actionLoading.value = false
+  }
+}
+async function loadContainerOptions(containerNo = '') {
+  const request = ++containerOptionRequest
+  containerOptionsLoading.value = true
+  containerLoadError.value = null
+  try {
+    const result = await listPendingContainerSummaries({
+      page: 1,
+      size: 50,
+      containerNo: containerNo.trim() || undefined,
+    })
+    if (request !== containerOptionRequest) return
+    containerOptions.value = result.records
+  } catch (error) {
+    if (request !== containerOptionRequest) return
+    containerOptions.value = []
+    containerLoadError.value = getApiErrorDetails(error, '待分配柜列表加载失败，请重试')
+  } finally {
+    if (request === containerOptionRequest) containerOptionsLoading.value = false
+  }
+}
+function openContainerConversion() {
+  selectedContainerBookingId.value = ''
+  containerOptions.value = []
+  containerLoadError.value = null
+  actionError.value = null
+  containerConvertOpen.value = true
+  void loadContainerOptions()
+}
+async function convertContainerInboundPlans() {
+  const container = selectedContainer.value
+  if (!container?.sourceContainerBookingId) { ElMessage.warning('请选择一个待分配柜'); return }
+  if (!container.eligible) {
+    actionError.value = { message: container.ineligibleReason || '所选柜当前不满足生成资格' }
+    return
+  }
+  actionLoading.value = true
+  actionError.value = null
+  try {
+    const plans = await convertLastMileContainerToInboundPlans({ sourceContainerBookingId: container.sourceContainerBookingId })
+    containerConvertOpen.value = false
+    selectedContainerBookingId.value = ''
+    ElMessage.success(`已按柜生成 ${plans.length} 个独立入库计划`)
     await load()
   } catch (error) {
     actionError.value = getApiErrorDetails(error, '生成整柜入库计划失败，请重试')
@@ -244,21 +261,8 @@ onMounted(() => { void load() })
     <LoadErrorState v-if="actionError" title="尾程订单操作失败" :message="actionError.message" compact>
       <template #details><ApiErrorMeta :details="actionError" /></template>
     </LoadErrorState>
-    <section v-if="!loadError && statusTab === '待分配'" class="surface-panel table-panel container-planning-panel">
-      <el-alert title="选择一行即代表整柜；一次调用将为柜内每个尾程订单/入仓码分别生成独立入库计划，海外 PDA 仍按同一柜号作业。" type="info" :closable="false" show-icon />
-      <DataTable v-model:page="page" v-model:page-size="pageSize" :data="containerRows" :columns="containerColumns" :loading="loading" :total="containerTotal" preference-key="overseas-last-mile-container-plans" row-key="sourceContainerBookingId" empty-text="暂无待分配整柜" @update:page="load()" @update:page-size="page = 1; load()">
-        <template #actions="{ row }">
-          <el-tooltip content="按整柜原子生成入库计划" placement="top">
-            <span><el-button v-if="access.can(permission.inboundOrderCreate)" size="small" type="primary" plain :disabled="!(row as PendingContainerSummaryDto).eligible || actionLoading" @click="generateContainerInboundPlans(row as PendingContainerSummaryDto)">生成整柜入库计划</el-button></span>
-          </el-tooltip>
-        </template>
-        <template #eligibility="{ row }"><el-tag :type="(row as PendingContainerSummaryDto).eligible ? 'success' : 'danger'" effect="plain">{{ (row as PendingContainerSummaryDto).eligible ? '可生成' : (row as PendingContainerSummaryDto).ineligibleReason || '不可生成' }}</el-tag></template>
-        <template #planNotice="{ row }">将为 {{ (row as PendingContainerSummaryDto).orderCount }} 个尾程订单生成 {{ (row as PendingContainerSummaryDto).orderCount }} 个独立入库计划，PDA仍按同柜作业</template>
-        <template #pagination-left>共 {{ containerTotal }} 个待分配整柜</template>
-      </DataTable>
-    </section>
-    <section v-else-if="!loadError" class="surface-panel table-panel"><DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-last-mile-orders" row-key="id" empty-text="暂无尾程订单" @selection-change="onSelectionChange" @update:page="load()" @update:page-size="page = 1; load()">
-      <template #toolbar-actions><el-button v-if="access.can(permission.lastMileOrderTransfer)" plain :disabled="!selectedRows.length || actionLoading" @click="openTransfer">转仓</el-button></template>
+    <section v-if="!loadError" class="surface-panel table-panel"><DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-last-mile-orders" row-key="id" empty-text="暂无尾程订单" @selection-change="onSelectionChange" @update:page="load()" @update:page-size="page = 1; load()">
+      <template #toolbar-actions><el-button v-if="access.can(permission.lastMileOrderTransfer)" plain :disabled="!selectedRows.length || actionLoading" @click="openTransfer">转仓</el-button><el-button v-if="access.can(permission.inboundOrderCreate)" type="primary" plain :disabled="selectedRows.length !== 1 || actionLoading" @click="convertInboundPlan">生成入库计划</el-button><el-button v-if="statusTab === '待分配' && access.can(permission.inboundOrderCreate)" type="primary" :disabled="actionLoading" @click="openContainerConversion">按柜批量生成</el-button></template>
       <template #actions="{ row }"><el-button size="small" plain type="primary" @click="openDetail(row)"><Eye :size="15" />查看</el-button></template>
       <template #orderNo="{ row }"><OrderReferenceText :value="String(row.orderNo || '')" /></template>
       <template #pagination-left>共 {{ total }} 条尾程订单 · 已选 {{ selectedRows.length }} 条</template>
@@ -272,10 +276,24 @@ onMounted(() => { void load() })
       <el-form-item label="备注"><el-input v-model="transferForm.remark" type="textarea" maxlength="500" /></el-form-item>
     </el-form>
   </AppDialog>
+  <AppDialog v-model="containerConvertOpen" title="按柜批量生成入库计划" width="640px" confirm-text="确认按柜生成" :loading="containerOptionsLoading" :confirm-loading="actionLoading" :confirm-disabled="!selectedContainer || !selectedContainer.eligible" @confirm="convertContainerInboundPlans">
+    <p class="container-convert-hint">将为所选柜内所有待分配尾程订单分别生成独立入库计划。</p>
+    <LoadErrorState v-if="containerLoadError" title="待分配柜加载失败" :message="containerLoadError.message" compact @retry="loadContainerOptions()">
+      <template #details><ApiErrorMeta :details="containerLoadError" /></template>
+    </LoadErrorState>
+    <el-form v-else label-position="top">
+      <el-form-item label="选择待分配柜" required>
+        <el-select v-model="selectedContainerBookingId" filterable remote clearable :remote-method="loadContainerOptions" :loading="containerOptionsLoading" placeholder="输入柜号搜索并选择">
+          <el-option v-for="container in containerOptions" :key="container.sourceContainerBookingId" :value="container.sourceContainerBookingId" :disabled="!container.eligible" :label="`${container.containerNo || '柜号缺失'} · ${container.orderCount} 票${container.eligible ? '' : ` · ${container.ineligibleReason || '不可生成'}`}`" />
+        </el-select>
+      </el-form-item>
+      <el-alert v-if="selectedContainer" :title="selectedContainer.eligible ? `确认后将生成该柜全部 ${selectedContainer.orderCount} 票的独立入库计划` : selectedContainer.ineligibleReason || '所选柜不可生成'" :type="selectedContainer.eligible ? 'info' : 'error'" :closable="false" show-icon />
+    </el-form>
+  </AppDialog>
 </template>
 
 <style scoped>
 .last-mile-toolbar { padding: 14px 16px 0; }
 .last-mile-toolbar :deep(.query-toolbar) { margin-top: 12px; padding: 12px 0 16px; border: 0; border-top: 1px solid var(--cc-border); border-radius: 0; }
-.container-planning-panel > :deep(.el-alert) { margin-bottom: 12px; }
+.container-convert-hint { margin: 0 0 16px; color: var(--cc-muted); line-height: 1.6; }
 </style>