优化

src/modules/container-loading/pages/GlobalSmartLoadingView.vue

@@ -54,8 +54,10 @@ const selectedCandidate = ref<SmartLoadingCandidateRow | null>(null)
 const assignForm = reactive({ packageCount: 1 })
 const quantityDrafts = reactive<Record<string, number>>({})
 const planGroupsByInboundId = ref(new Map<string, SmartLoadingPlanCoLoadGroup>())
-const query = ref<QueryModel>({ customerId: '', inboundCode: '' })
+const query = ref<QueryModel>({ customerId: '', inboundCode: '', expectedArrivalRange: [], orderStatus: '' })
 const appliedQuery = ref<QueryModel>({ ...query.value })
+const candidatePage = ref(1)
+const candidatePageSize = ref(20)
 let selectionRequest = 0
 
 const canAssign = computed(() => access.can('platform:firstleg:smart-loading:assign'))
@@ -171,9 +173,23 @@ const volumePercent = computed(() => volumeLimit.value ? totalVolume.value / vol
 const weightPercent = computed(() => weightLimit.value ? totalWeight.value / weightLimit.value * 100 : 0)
 const displayedVolumePercent = computed(() => percentage(volumePercent.value))
 const displayedWeightPercent = computed(() => percentage(weightPercent.value))
+const candidateOrderStatusLabels: Record<string, string> = {
+  DRAFT: '草稿', SUBMITTED: '待审核', PENDING_REVIEW: '待审核', APPROVED: '已审核', ACCEPTED: '已受理',
+  REJECTED: '已驳回', PROCESSING: '处理中', WAIT_MEASURE: '待测量数据', WAIT_SPLIT: '待分柜',
+  LOADING: '装柜中', LOADED: '装柜完成', COMPLETED: '已完成', DELIVERED: '派送完成', CANCELLED: '已取消',
+}
+function candidateOrderStatusLabel(status: string) {
+  return candidateOrderStatusLabels[status] || '未知状态'
+}
+const candidateOrderStatusOptions = computed(() => [...new Set(candidates.value
+  .map((candidate) => candidate.orderStatusSnapshot?.trim().toUpperCase() || '')
+  .filter(Boolean))]
+  .map((status) => ({ value: status, label: candidateOrderStatusLabel(status) })))
 const queryFields = computed<QueryField[]>(() => [
   { key: 'customerId', type: 'select', label: '客户', placeholder: '全部客户', width: 220, options: customers.value.filter((customer) => customer.status === 'ACTIVE').map((customer) => ({ label: customer.tenantName, value: String(customer.id) })), props: { filterable: true, loading: customersLoading.value } },
   { key: 'inboundCode', type: 'input', label: '入仓码', placeholder: '请输入入仓码', width: 240 },
+  { key: 'expectedArrivalRange', type: 'daterange', label: '预计到货时间', placeholder: '请选择预计到货时间范围', width: 300 },
+  { key: 'orderStatus', type: 'select', label: '订单状态', placeholder: '全部订单状态', width: 200, options: candidateOrderStatusOptions.value },
 ])
 
 const filteredContainers = computed(() => containers.value.filter((item) => (
@@ -184,13 +200,27 @@ const filteredContainers = computed(() => containers.value.filter((item) => (
 const filteredCandidates = computed(() => {
   const customerId = String(appliedQuery.value.customerId || '')
   const inboundCode = String(appliedQuery.value.inboundCode || '').trim().toLowerCase()
+  const orderStatus = String(appliedQuery.value.orderStatus || '').trim().toUpperCase()
+  const arrivalRange = Array.isArray(appliedQuery.value.expectedArrivalRange)
+    ? appliedQuery.value.expectedArrivalRange.map((value) => String(value || '').slice(0, 10))
+    : []
   const channelCode = selectedContainer.value?.channelCode || activeChannelCode.value
   return displayedCandidates.value.filter((item) => {
     if (!channelCode || item.channelCode !== channelCode) return false
     if (customerId && !item.sourceCandidates.some((member) => member.accountId === customerId)) return false
-    return !inboundCode || item.memberInboundCodes.some((code) => code.toLowerCase().includes(inboundCode))
+    if (inboundCode && !item.memberInboundCodes.some((code) => code.toLowerCase().includes(inboundCode))) return false
+    if (orderStatus && !item.sourceCandidates.some((member) => member.orderStatusSnapshot?.trim().toUpperCase() === orderStatus)) return false
+    if (arrivalRange.length === 2 && !item.sourceCandidates.some((member) => {
+      const arrivalDate = member.expectedArrivalAt?.slice(0, 10) || ''
+      return arrivalDate && arrivalDate >= arrivalRange[0] && arrivalDate <= arrivalRange[1]
+    })) return false
+    return true
   })
 })
+const pagedCandidates = computed(() => {
+  const start = (candidatePage.value - 1) * candidatePageSize.value
+  return filteredCandidates.value.slice(start, start + candidatePageSize.value)
+})
 
 function preferredContainerId() {
   const visible = filteredContainers.value
@@ -273,6 +303,7 @@ async function loadSelectedData(preserved: Record<string, number> = {}) {
   clearSelectionData()
   if (!container) return
   if (container.planStatus === 'COMPLETED') return
+  candidatePage.value = 1
   selectionLoading.value = true
   try {
     const [candidateResult, planResult] = await Promise.all([
@@ -351,6 +382,7 @@ async function selectChannel(channelCode: string) {
 }
 async function applyFilters(model: QueryModel) {
   appliedQuery.value = { ...model }
+  candidatePage.value = 1
   if (!filteredContainers.value.some((item) => item.id === selectedContainerId.value)) {
     selectedContainerId.value = preferredContainerId()
     await loadSelectedData()
@@ -548,9 +580,13 @@ onMounted(() => { void load(); void loadCustomers() })
           <section class="dispatch-pane candidate-pane">
             <header class="pane-header"><div><strong>候选装柜明细</strong><small>{{ activeChannel?.name || '未选择渠道' }} · {{ selectedContainer?.warehouseName || '请先选择柜次' }}</small></div></header>
             <DataTable
-              :data="filteredCandidates"
+              v-model:page="candidatePage"
+              v-model:page-size="candidatePageSize"
+              :data="pagedCandidates"
               :columns="candidateColumns"
               :loading="loading || selectionLoading || mutating"
+              :total="filteredCandidates.length"
+              :page-sizes="[20, 50, 100]"
               stripe
               preference-key="global-smart-loading-candidates"
               column-settings-mode="hide"