优化

src/modules/finance/pages/FinanceFormalSettlementPage.vue

@@ -4,7 +4,7 @@ import { ElMessage, ElMessageBox, type UploadFile } from 'element-plus'
 import { ArrowLeft, CreditCard, Download, Eye, HandCoins, Plus, RotateCcw, XCircle } from '@lucide/vue'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { listPlatformTenants, type PlatformTenantResource } from '@/modules/iam'
-import { listPlatformPartners, type PlatformPartnerResource } from '@/modules/master-data'
+import { categoryLabels, listSuppliers, type Supplier } from '@/modules/suppliers'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import AdminPage from '@/shared/components/AdminPage.vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
@@ -54,7 +54,7 @@ const createOpen = ref(false)
 const createBusy = ref(false)
 const statementOptions = ref<FinanceStatementReadModel[]>([])
 const feeOptions = ref<FinanceFeePoolItem[]>([])
-const supplierOptions = ref<PlatformPartnerResource[]>([])
+const supplierOptions = ref<Supplier[]>([])
 const createForm = ref({ reconciliationStatementId: '', supplierId: '', feeSourceIds: [] as string[], dueDate: '' })
 const paymentOpen = ref(false)
 const paymentBusy = ref(false)
@@ -208,10 +208,10 @@ async function openCreate() {
     } else {
       const [fees, suppliers] = await Promise.all([
         listFinanceFeePool(customerId, 'PAYABLE'),
-        listPlatformPartners({ page: 1, size: 200, status: 'ACTIVE' }),
+        listSuppliers({ page: 1, size: 200, status: 'ACTIVE' }),
       ])
       feeOptions.value = fees.filter((item) => item.feeSourceId && item.status === 'AVAILABLE')
-      supplierOptions.value = suppliers.records
+      supplierOptions.value = suppliers.records.filter((item) => item.status === 'ACTIVE')
     }
   } catch (cause) { error.value = getApiErrorDetails(cause, '结算来源加载失败') }
 }
@@ -489,7 +489,7 @@ onMounted(() => {
     <AppDialog v-model="createOpen" :title="`生成${title}`" width="min(560px, 94vw)" :confirm-loading="createBusy" @confirm="submitCreate">
       <el-form label-position="top">
         <el-form-item v-if="kind === 'receivable'" label="已出账对账单"><el-select v-model="createForm.reconciliationStatementId" filterable><el-option v-for="item in statementOptions" :key="item.id" :label="`${item.billNo} · ${item.outstandingAmount} CNY`" :value="item.id" /></el-select></el-form-item>
-        <template v-else><el-form-item label="供应商"><el-select v-model="createForm.supplierId" filterable placeholder="请选择供应商"><el-option v-for="item in supplierOptions" :key="String(item.id)" :label="`${item.partnerName} · ${item.partnerCode}`" :value="String(item.id)" /></el-select></el-form-item><el-form-item label="到期日"><el-date-picker v-model="createForm.dueDate" type="date" value-format="YYYY-MM-DD" /></el-form-item><el-form-item label="应付费用来源"><el-select v-model="createForm.feeSourceIds" multiple filterable><el-option v-for="item in feeOptions" :key="item.feeSourceId!" :label="`${item.feeItemName} · ${item.amount} CNY`" :value="item.feeSourceId!" /></el-select></el-form-item></template>
+        <template v-else><el-form-item label="供应商"><el-select v-model="createForm.supplierId" filterable placeholder="请选择供应商"><el-option v-for="item in supplierOptions" :key="String(item.id)" :label="`${item.name} · ${categoryLabels[item.category]}`" :value="String(item.id)" /></el-select></el-form-item><el-form-item label="到期日"><el-date-picker v-model="createForm.dueDate" type="date" value-format="YYYY-MM-DD" /></el-form-item><el-form-item label="应付费用来源"><el-select v-model="createForm.feeSourceIds" multiple filterable><el-option v-for="item in feeOptions" :key="item.feeSourceId!" :label="`${item.feeItemName} · ${item.amount} CNY`" :value="item.feeSourceId!" /></el-select></el-form-item></template>
       </el-form>
     </AppDialog>
 

src/modules/finance/pages/FinanceG3G4Views.test.ts

@@ -5,7 +5,7 @@ import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vites
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { useAuthStore } from '@/core/auth/auth'
 import { listPlatformTenants, type PlatformTenantResource } from '@/modules/iam'
-import { listPlatformPartners, type PlatformPartnerResource } from '@/modules/master-data'
+import { listSuppliers, type Supplier } from '@/modules/suppliers'
 import { ApiResponseError } from '@/shared/api/http'
 import {
   actionReconciliationStatement,
@@ -25,7 +25,10 @@ import FinanceCustomerStatementsView from './FinanceCustomerStatementsView.vue'
 import FinanceFormalSettlementPage from './FinanceFormalSettlementPage.vue'
 
 vi.mock('@/modules/iam', () => ({ listPlatformTenants: vi.fn() }))
-vi.mock('@/modules/master-data', () => ({ listPlatformPartners: vi.fn() }))
+vi.mock('@/modules/suppliers', () => ({
+  listSuppliers: vi.fn(),
+  categoryLabels: { BOOKING: '订舱', CUSTOMS: '报关', TRUCKING: '拖车', CERTIFICATE: '证书' },
+}))
 vi.mock('../api/finance', () => ({
   actionReconciliationStatement: vi.fn(), createFinanceSettlementPayment: vi.fn(), createPayableSettlement: vi.fn(),
   createReceivableSettlement: vi.fn(), getFinanceSettlement: vi.fn(), getReconciliationStatement: vi.fn(),
@@ -70,7 +73,7 @@ describe('Finance G3/G4 views', () => {
     document.body.innerHTML = ''
     const customer = { id: '10001', tenantName: '客户A', status: 'ACTIVE' } as PlatformTenantResource
     vi.mocked(listPlatformTenants).mockReset().mockResolvedValue({ records: [customer], page: 1, size: 200, total: 1, pages: 1 })
-    vi.mocked(listPlatformPartners).mockReset().mockResolvedValue({ records: [{ id: '301', tenantId: '0', dataScopeId: '0', partnerCode: 'PARTNER-301', partnerName: '往来单位A', partnerType: 'CUSTOMER', types: ['CUSTOMER'], contactName: '', contactPhone: '', contactEmail: null, countryCode: 'CN', province: null, city: '', district: null, addressLine: '', postalCode: null, status: 'ACTIVE', remark: null } as PlatformPartnerResource], page: 1, size: 200, total: 1, pages: 1 })
+    vi.mocked(listSuppliers).mockReset().mockResolvedValue({ records: [{ id: '301', tenantId: '0', name: '拖车供应商A', category: 'TRUCKING', scope: 'DOMESTIC', region: '宁波', legalRepresentative: '', contactName: '', phone: '', email: null, address: null, businessLicenseNo: null, licenseFileId: null, status: 'ACTIVE', settlementPeriod: 'MONTHLY_30', remark: null, createdBy: null, createdAt: '2026-08-01', updatedBy: null, updatedAt: '2026-08-01', deleted: false, version: 0 } as Supplier], page: 1, size: 200, total: 1, pages: 1 })
     vi.mocked(listFinanceStatements).mockReset().mockResolvedValue([statement])
     vi.mocked(getReconciliationStatement).mockReset().mockResolvedValue(statementDetail)
     vi.mocked(actionReconciliationStatement).mockReset().mockResolvedValue(statementDetail)
@@ -106,8 +109,8 @@ describe('Finance G3/G4 views', () => {
     const wrapper = await mountWithAccess(FinanceFormalSettlementPage, ['platform:finance:settlement-ap:list', 'platform:finance:settlement-ap:create', 'platform:finance:payment:create'], { kind: 'payable' })
     const vm = wrapper.vm as unknown as { load(model: Record<string, string>): Promise<void>; openCreate(): Promise<void>; submitCreate(): Promise<void>; openPayment(row: FinancePayableSettlement): void; submitPayment(): Promise<void>; createForm: { supplierId: string; dueDate: string; feeSourceIds: string[] }; paymentFile: File | null; paymentForm: { amount: number; transactionDate: string; method: 'BANK_TRANSFER'; referenceNo: string; remark: string } }
     await vm.load({ customerId: '10001' }); await vm.openCreate()
-    expect(listPlatformPartners).toHaveBeenCalledWith({ page: 1, size: 200, status: 'ACTIVE' })
-    expect(document.body.textContent).toContain('往来单位A · PARTNER-301')
+    expect(listSuppliers).toHaveBeenCalledWith({ page: 1, size: 200, status: 'ACTIVE' })
+    expect(document.body.textContent).toContain('拖车供应商A · 拖车')
     Object.assign(vm.createForm, { supplierId: '301', dueDate: '2026-09-30', feeSourceIds: ['81'] })
     await vm.submitCreate()
     expect(createPayableSettlement).toHaveBeenCalledWith({ customerId: '10001', supplierId: '301', feeSourceIds: ['81'], dueDate: '2026-09-30', currency: 'CNY' })