优化

src/modules/loading-lists/api/containerFees.test.ts

@@ -1,13 +1,13 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { http } from '@/shared/api/http'
-import { adjustContainerFee, approveContainerFee, createContainerFee, listContainerCostDetails, listContainerFees, rejectContainerFee, voidContainerFee } from './containerFees'
+import { adjustContainerFee, approveContainerFee, createContainerFee, listContainerCostDetails, listContainerFeePartnerOptions, listContainerFees, rejectContainerFee, voidContainerFee } from './containerFees'
 
 describe('container fee API', () => {
   beforeEach(() => vi.restoreAllMocks())
   it('passes accountId and exact controller DTOs', async () => {
     const get = vi.spyOn(http, 'get').mockResolvedValue({ code: '200', data: [] })
     const post = vi.spyOn(http, 'post').mockResolvedValue({ code: '200', data: { id: 3, sourceVersion: 1 } })
-    const values = { feeItemId: '7', direction: 'PAYABLE' as const, businessDate: '2026-08-12', amount: 100, currency: 'CNY' as const, settlementIncluded: true, remark: null }
+    const values = { feeItemId: '7', direction: 'PAYABLE' as const, partnerId: '41', partnerName: '承运商A', businessDate: '2026-08-12', amount: 100, currency: 'CNY' as const, settlementIncluded: true, remark: null }
     await listContainerFees('9', '11'); await createContainerFee('9', '11', values)
     await approveContainerFee('9', '11', '3'); await rejectContainerFee('9', '11', '3', '资料不全')
     await adjustContainerFee('9', '11', '3', 2, values); await voidContainerFee('9', '11', '3', 3)
@@ -17,6 +17,12 @@ describe('container fee API', () => {
     expect(post).toHaveBeenCalledWith('/platform/v1/loading-plans/9/fee-details/3/void', { expectedSourceVersion: 3 }, { params: { accountId: '11' } })
   })
 
+  it('loads only ACTIVE counterparties for payable selection', async () => {
+    const get = vi.spyOn(http, 'get').mockResolvedValue({ code: '200', data: { records: [{ id: 41, partnerName: '承运商A' }] } })
+    await expect(listContainerFeePartnerOptions()).resolves.toEqual([{ id: '41', partnerName: '承运商A' }])
+    expect(get).toHaveBeenCalledWith('/platform/v1/partners', { params: { status: 'ACTIVE', page: 1, size: 200 } })
+  })
+
   it('reads allocation rows from Finance and never calculates them', async () => {
     const get = vi.spyOn(http, 'get')
       .mockResolvedValueOnce({ code: '200', data: [{ id: 81, containerId: 99 }] })

src/modules/loading-lists/api/containerFees.ts

@@ -11,6 +11,8 @@ export interface ContainerFeeResource {
   feeItemId: string
   feeItemName: string
   direction: ContainerFeeDirection
+  partnerId: string | null
+  partnerName: string | null
   businessDate: string
   amount: number
   currency: 'CNY'
@@ -27,6 +29,8 @@ export interface ContainerFeeResource {
 export interface ContainerFeeSaveRequest {
   feeItemId: string
   direction: ContainerFeeDirection
+  partnerId: string | null
+  partnerName: string | null
   businessDate: string
   amount: number
   currency: 'CNY'
@@ -43,6 +47,11 @@ export interface ApplicableFeeItem {
   pickupPayable: boolean
 }
 
+export interface ContainerFeePartnerOption {
+  id: string
+  partnerName: string
+}
+
 export interface ContainerCostAllocation {
   id: string
   orderId: string
@@ -73,6 +82,7 @@ function normalizeFee(raw: Record<string, unknown>): ContainerFeeResource {
     id: id(raw.id), loadingPlanId: id(raw.loadingPlanId), containerBookingId: raw.containerBookingId == null ? null : id(raw.containerBookingId),
     containerNo: raw.containerNo == null ? null : String(raw.containerNo), feeItemId: id(raw.feeItemId),
     feeItemName: String(raw.feeItemNameSnapshot || ''), direction: raw.direction as ContainerFeeDirection,
+    partnerId: raw.partnerId == null ? null : id(raw.partnerId), partnerName: raw.partnerName == null ? null : String(raw.partnerName),
     businessDate: String(raw.businessDate || ''), amount: numberValue(raw.amount), currency: 'CNY',
     settlementIncluded: Boolean(raw.settlementIncluded), reviewStatus: raw.reviewStatus as ContainerFeeReviewStatus,
     sourceStatus: raw.sourceStatus as ContainerFeeResource['sourceStatus'], sourceVersion: numberValue(raw.sourceVersion),
@@ -113,6 +123,11 @@ export async function listApplicableFeeItems() {
   return (unwrapApiResponse(response).records || []).map((raw) => ({ id: id(raw.id), name: String(raw.feeTypeName || ''), warehouseReceivable: Boolean(raw.warehouseReceivable), warehousePayable: Boolean(raw.warehousePayable), pickupReceivable: Boolean(raw.pickupReceivable), pickupPayable: Boolean(raw.pickupPayable) }))
 }
 
+export async function listContainerFeePartnerOptions(): Promise<ContainerFeePartnerOption[]> {
+  const response = await http.get<ApiEnvelope<{ records: Record<string, unknown>[] }>, ApiEnvelope<{ records: Record<string, unknown>[] }>>('/platform/v1/partners', { params: { status: 'ACTIVE', page: 1, size: 200 } })
+  return (unwrapApiResponse(response).records || []).map((raw) => ({ id: id(raw.id), partnerName: String(raw.partnerName || '') }))
+}
+
 export async function listContainerCostDetails(customerId: string, containerId: string): Promise<ContainerCostDetail[]> {
   const response = await http.get<ApiEnvelope<Record<string, unknown>[]>, ApiEnvelope<Record<string, unknown>[]>>('/platform/finance/v1/cost-entries', { params: { customerId } })
   const costs = unwrapApiResponse(response).filter((raw) => id(raw.containerId) === containerId)