优化

src/modules/unified-orders/pages/UnifiedOrdersView.test.ts

@@ -100,7 +100,7 @@ describe('UnifiedOrdersView contract', () => {
       'actualVolumeCbm', 'totalNetWeightKg', 'chargeableWeightKg', 'chargeableVolumeCbm', 'expectedShipDate',
       'expectedArrivalAt', 'feeReviewStatus', 'skuNos', 'totalQuantity', 'expressCompany', 'expressTrackingNo',
       'shipmentId', 'referenceId', 'containerNo', 'cabinetNo',
-      'sailingAt', 'portArrivalAt', 'customerRemark', 'latestInternalNote', 'createdAt', 'updatedAt',
+      'effectiveSailingAt', 'effectivePortArrivalAt', 'customerRemark', 'latestInternalNote', 'createdAt', 'updatedAt',
     ]
     for (const key of expectedColumnKeys) expect(columnSource).toContain(`key: '${key}'`)
     for (const uncontractedKey of [
@@ -115,10 +115,18 @@ describe('UnifiedOrdersView contract', () => {
     expect(columnSource).not.toContain("label: '配载状态'")
     expect(columnSource).not.toContain("key: 'recommendedPalletType'")
     expect(columnSource).toContain("key: 'requestedPickupAt', prop: 'requestedPickupAt', label: '预约提货时间'")
-    expect(columnSource.match(/defaultVisible: false/g)).toHaveLength(16)
+    expect(columnSource.match(/defaultVisible: false/g)).toHaveLength(14)
+    expect(columnSource).toContain("key: 'effectiveSailingAt', prop: 'effectiveSailingAt', label: '开船时间', minWidth: 180, slotName: 'field' }")
+    expect(columnSource).toContain("key: 'effectivePortArrivalAt', prop: 'effectivePortArrivalAt', label: '到港时间', minWidth: 180, slotName: 'field' }")
+    expect(source).toContain('preference-key="unified-orders-table-v2"')
     expect(source).toContain("property === 'requestedPickupAt' && (row.pickupMethod !== 'PICKUP' || !value)")
     expect(source).toContain("property === 'skuNos' ? value.join('、')")
     expect(source).not.toContain('<dt>推荐托盘类型</dt>')
+    expect(source).toContain("estimated === true ? '预计 ' : ''")
+    expect(source).toContain('row.transport?.effectiveSailingAtEstimated')
+    expect(source).toContain('row.transport?.effectivePortArrivalAtEstimated')
+    expect(source).not.toContain("transport.sailingAt")
+    expect(source).not.toContain("transport.portArrivalAt")
     expect(source).toContain('.table-card { overflow: hidden; }')
     expect(source).toContain('slotName: \'measurementReviewStatus\'')
     expect(source).toContain('unifiedOrderReviewStatusLabel(value, \'未录入\')')