优化

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

@@ -77,6 +77,9 @@ const columns: DataTableColumn[] = [
   { key: 'pickedCartons', prop: 'pickedCartons', label: '实际拣货数', width: 110, align: 'right' },
   { key: 'volume', prop: 'volume', label: '计费体积(m³)', width: 125, align: 'right' },
   { key: 'pallets', prop: 'pallets', label: '总托盘数', width: 100, align: 'right' },
+  { key: 'assigned', prop: 'assigned', label: '分配', width: 82, align: 'center' },
+  { key: 'mergeAllowed', prop: 'mergeAllowed', label: '合托', width: 96, align: 'center' },
+  { key: 'urgent', prop: 'urgent', label: '加急', width: 82, align: 'center' },
   { key: 'status', prop: 'status', label: '状态', width: 100 },
   { key: 'appointmentStatus', prop: 'appointmentStatus', label: 'FBA预约', width: 110 },
   { key: 'dispatchStatus', prop: 'dispatchStatus', label: '排车状态', width: 110 },
@@ -100,6 +103,7 @@ function toListItem(dto: InboundOrderSummaryDto): InboundOrderListItem {
     warehouseId: text(dto.warehouseId) === '—' ? '' : String(dto.warehouseId), destinationWarehouseCode: text(dto.warehouseCode), destinationWarehouseName: text(dto.warehouseName),
     orderNo: text(dto.planNo), inboundCode: text(dto.inboundCode), lxCode: text(dto.lxCode), type: typeLabel(dto.orderType), warehouse: receivingWarehouse(dto.overseasWarehouseCode, dto.overseasWarehouseName),
     fbaWarehouse: text(dto.fbaWarehouseCode), owner: text(dto.customerName), cartons: number(dto.packageCount), pickedCartons: number(dto.pickedPackageCount), volume: number(dto.volumeCbm), pallets: number(dto.palletCount),
+    assigned: dto.assigned ? '已分配' : '未分配', mergeAllowed: dto.mergeAllowed ? '可合托' : '不合托', urgent: dto.urgent ? '加急' : '普通',
     status: planStatusLabel(dto.status), appointmentNo: text(dto.appointmentNo), appointmentStatus: appointmentStatusLabel(dto.appointmentStatus),
     appointmentAt: formatOverseasDateTime(dto.appointmentAt), expectedLoadingAt: formatOverseasDateTime(dto.expectedLoadingAt), dispatchStatus: dto.dispatchStatus === 'SCHEDULED' ? '已排车' : '未排车',
     createdAt: formatOverseasDateTime(dto.createdAt), version: number(dto.version),

src/modules/overseas-warehouse/pages/prototypeContract.test.ts

@@ -206,6 +206,10 @@ describe('overseas warehouse first-batch prototype contract', () => {
     expect(value).toContain('access.can(permission.inboundOrderAppointment)')
     expect(value).toContain('access.can(permission.inboundOrderSmartDispatch)')
     expect(value).toContain('<SmartDispatchDialog')
+    expect(value).toContain("key: 'assigned', prop: 'assigned', label: '分配'")
+    expect(value).toContain("key: 'mergeAllowed', prop: 'mergeAllowed', label: '合托'")
+    expect(value).toContain("key: 'urgent', prop: 'urgent', label: '加急'")
+    expect(value).toContain("dto.mergeAllowed ? '可合托' : '不合托'")
     expect(value).not.toContain('ContractPendingNotice')
   })
 
@@ -353,7 +357,7 @@ describe('overseas warehouse first-batch prototype contract', () => {
     ])
     expect(columnKeys('InboundOrdersView.vue')).toEqual([
       'actions', 'selection', 'orderNo', 'inboundCode', 'lxCode', 'type', 'warehouse', 'fbaWarehouse', 'owner', 'cartons', 'pickedCartons', 'volume',
-      'pallets', 'status', 'appointmentStatus', 'dispatchStatus', 'createdAt',
+      'pallets', 'assigned', 'mergeAllowed', 'urgent', 'status', 'appointmentStatus', 'dispatchStatus', 'createdAt',
     ])
     expect(columnKeys('InventoryView.vue')).toEqual([
       'actions', 'owner', 'warehouse', 'sku', 'productName', 'location', 'onHand', 'available', 'held', 'looseboard',