优化

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

@@ -96,20 +96,29 @@ describe('UnifiedOrdersView contract', () => {
     const columnSource = source.slice(source.indexOf('const columns ='), source.indexOf('function emptyFilters'))
     const expectedColumnKeys = [
       'actions', 'orderNo', 'inboundCode', 'mainStatus', 'customerName', 'receivingWarehouseName',
-      'destinationWarehouseName', 'channelName', 'totalPackageCount', 'recommendedPalletType', 'locationCodes', 'measurementReviewStatus', 'actualGrossWeightKg',
-      'actualVolumeCbm', 'chargeableWeightKg', 'expectedShipDate', 'loadingStatus', 'containerNo', 'cabinetNo',
+      'destinationWarehouseName', 'channelName', 'totalPackageCount', 'totalPalletCount', 'requestedPickupAt', 'locationCodes', 'measurementReviewStatus', 'actualGrossWeightKg',
+      'actualVolumeCbm', 'totalNetWeightKg', 'chargeableWeightKg', 'chargeableVolumeCbm', 'expectedShipDate',
+      'expectedArrivalAt', 'feeReviewStatus', 'skuNos', 'totalQuantity', 'expressCompany', 'expressTrackingNo',
+      'shipmentId', 'referenceId', 'containerNo', 'cabinetNo',
       'sailingAt', 'portArrivalAt', 'customerRemark', 'latestInternalNote', 'createdAt', 'updatedAt',
     ]
     for (const key of expectedColumnKeys) expect(columnSource).toContain(`key: '${key}'`)
     for (const uncontractedKey of [
-      'internalOrderStatus', 'expectedArrivalAt', 'feeReviewStatus', 'holdCargo', 'companyName',
-      'pickupMethod', 'chargeableVolumeCbm', 'associatedFiles', 'createdBy',
+      'internalOrderStatus', 'holdCargo', 'companyName', 'pickupMethod', 'associatedFiles', 'createdBy',
     ]) expect(columnSource).not.toContain(`key: '${uncontractedKey}'`)
     expect(columnSource.indexOf("key: 'actions'")).toBeLessThan(columnSource.indexOf("key: 'orderNo'"))
     expect(columnSource.indexOf("key: 'orderNo'")).toBeLessThan(columnSource.indexOf("key: 'inboundCode'"))
     expect(columnSource).toContain("{ key: 'mainStatus', prop: 'mainStatus', label: '订单主状态'")
-    expect(columnSource).toContain("{ key: 'loadingStatus', prop: 'loadingStatus', label: '配载状态', minWidth: 130, slotName: 'field', defaultVisible: false }")
-    expect(columnSource.match(/defaultVisible: false/g)).toHaveLength(10)
+    expect(columnSource).not.toContain("key: 'loadingStatus'")
+    expect(columnSource).not.toContain("key: 'businessDate'")
+    expect(columnSource).not.toContain("label: '业务日期'")
+    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(source).toContain("property === 'requestedPickupAt' && (row.pickupMethod !== 'PICKUP' || !value)")
+    expect(source).toContain("property === 'skuNos' ? value.join('、')")
+    expect(source).not.toContain('<dt>推荐托盘类型</dt>')
     expect(source).toContain('.table-card { overflow: hidden; }')
     expect(source).toContain('slotName: \'measurementReviewStatus\'')
     expect(source).toContain('unifiedOrderReviewStatusLabel(value, \'未录入\')')