优化

src/modules/finance/pages/FinanceCustomerStatementsView.vue

@@ -17,7 +17,7 @@ import ListPageLayout from '@/shared/components/ListPageLayout.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import QueryToolbar, { type QueryField, type QueryModel } from '@/shared/components/QueryToolbar.vue'
 import { showExportTaskCreatedDialog } from '@/shared/components/exportTaskCreatedDialog'
-import { actionReconciliationStatement, createReconciliationStatement, getFinanceFeeSource, getReconciliationStatement, listFinanceStatements } from '../api/finance'
+import { actionReconciliationStatement, createReconciliationStatement, getReconciliationStatement, listFinanceStatements } from '../api/finance'
 import { financeSourceTypeLabel, financeStatusLabel, financeStatusTone } from '../status'
 import type { FinanceReconciliationDetail, FinanceStatementReadModel, ReconciliationActionPayload } from '../types'
 
@@ -30,7 +30,7 @@ interface AdjustmentRow {
   reason: string
 }
 
-interface StatementRow extends FinanceStatementReadModel {
+type StatementRow = Omit<FinanceStatementReadModel, 'creditDays' | 'settled'> & {
   periodStart: string
   periodEnd: string
   creditDays: number | null
@@ -39,15 +39,6 @@ interface StatementRow extends FinanceStatementReadModel {
   remark: string
 }
 
-interface StatementLineSource {
-  containerNo: string
-  inboundCode: string
-  businessDate: string
-  quantity: number | null
-  unitPrice: number | null
-  sourceType: string
-}
-
 const access = useAccessPreviewStore()
 const route = useRoute()
 const router = useRouter()
@@ -66,7 +57,6 @@ const detailLoading = ref(false)
 const detailError = ref<ApiErrorDetails | null>(null)
 const activeDetailTab = ref<'lines' | 'payments'>('lines')
 const detailCache = new Map<string, FinanceReconciliationDetail>()
-const lineSourceCache = new Map<string, StatementLineSource>()
 const createOpen = ref(false)
 const createBusy = ref(false)
 const exportBusy = ref(false)
@@ -118,7 +108,11 @@ const columns: DataTableColumn[] = [
   { key: 'periodStart', label: '结算起始日', width: 130 },
   { key: 'periodEnd', label: '结算结束日', width: 130 },
   { key: 'creditDays', label: '账期(天)', width: 100 },
+  { key: 'lineCount', label: '费用明细数', width: 110 },
+  { key: 'sourceCount', label: '来源数量', width: 100 },
   { key: 'currency', label: '货币', width: 86 },
+  { key: 'sourceAmount', label: '调整前金额(CNY)', width: 150 },
+  { key: 'adjustmentAmount', label: '调整金额(CNY)', width: 145 },
   { key: 'totalAmount', label: '总应收金额(CNY)', width: 155 },
   { key: 'receivedAmount', label: '已收金额(CNY)', width: 145 },
   { key: 'outstandingAmount', label: '未收金额(CNY)', width: 145 },
@@ -127,10 +121,17 @@ const columns: DataTableColumn[] = [
   { key: 'remark', label: '备注', minWidth: 180 },
   { key: 'createdByName', label: '创建人', width: 130, slotName: 'createdByName' },
   { key: 'createdAt', label: '创建时间', minWidth: 170, slotName: 'createdAt' },
+  { key: 'submittedAt', label: '提交时间', minWidth: 170, slotName: 'submittedAt' },
+  { key: 'reviewedAt', label: '审核时间', minWidth: 170, slotName: 'reviewedAt' },
+  { key: 'issuedAt', label: '出账时间', minWidth: 170, slotName: 'issuedAt' },
   { key: 'updatedByName', label: '更新人', width: 130, slotName: 'updatedByName' },
   { key: 'updatedAt', label: '更新时间', minWidth: 170, slotName: 'updatedAt' },
 ]
 const detailLineColumns: DataTableColumn[] = [
+  { key: 'direction', label: '方向', width: 90, slotName: 'direction' },
+  { key: 'sourceType', label: '来源类型', width: 120, slotName: 'sourceType' },
+  { key: 'sourceNo', label: '业务单号', minWidth: 160 },
+  { key: 'orderId', label: '订单', minWidth: 150, slotName: 'orderId' },
   { key: 'inboundCode', label: '入仓号', minWidth: 150, slotName: 'inboundCode' },
   { key: 'containerNo', label: '柜次号', minWidth: 150, slotName: 'containerNo' },
   { key: 'businessDate', label: '业务发生日', width: 130, slotName: 'businessDate' },
@@ -150,6 +151,7 @@ const paymentColumns: DataTableColumn[] = [
   { key: 'amount', label: '支付金额(CNY)', width: 150 },
   { key: 'method', label: '支付方式', width: 130, slotName: 'method' },
   { key: 'referenceNo', label: '支付流水号', minWidth: 180 },
+  { key: 'voucherFileIds', label: '收款凭证', minWidth: 130, slotName: 'voucherFileIds' },
   { key: 'createdByName', label: '登记人', minWidth: 140, slotName: 'createdByName' },
   { key: 'occurredAt', label: '登记时间', width: 170, slotName: 'occurredAt' },
   { key: 'remark', label: '备注', minWidth: 200 },
@@ -180,12 +182,12 @@ function formatDateTime(value?: string) {
 }
 
 function detailToRow(row: FinanceStatementReadModel, current?: FinanceReconciliationDetail): StatementRow {
-  const latestPayment = current?.paymentHistory.map((item) => item.occurredAt || item.transactionDate).filter(Boolean).sort().at(-1) || ''
+  const latestPayment = current?.paymentHistory.map((item) => item.occurredAt || item.transactionDate).filter(Boolean).sort().at(-1) || row.lastReceiptAt || ''
   return {
     ...row,
-    periodStart: current?.periodStart || '', periodEnd: current?.periodEnd || row.billDate,
-    creditDays: current ? current.creditDays : null, settled: current ? current.settled : null,
-    lastPaymentAt: latestPayment, remark: current?.remark || '',
+    periodStart: current?.periodStart || row.periodStart || '', periodEnd: current?.periodEnd || row.periodEnd || row.billDate,
+    creditDays: current ? current.creditDays : row.creditDays ?? null, settled: current ? current.settled : row.settled ?? null,
+    lastPaymentAt: latestPayment, remark: current?.remark || row.remark || '',
     createdBy: current?.createdBy || row.createdBy, createdByName: current?.createdByName || row.createdByName, createdAt: current?.createdAt || row.createdAt,
     updatedBy: current?.updatedBy || row.updatedBy, updatedByName: current?.updatedByName || row.updatedByName, updatedAt: current?.updatedAt || row.updatedAt,
   }
@@ -207,29 +209,13 @@ const filteredRows = computed(() => rows.value.filter((row) => {
   return (!status || String(row.status).toLowerCase() === status)
     && (!billNo || row.billNo.toLowerCase().includes(billNo))
     && (!settled || String(row.settled) === settled)
-    && (!containerNo || Boolean(current?.lines.some((line) => lineSourceCache.get(line.sourceFeeId)?.containerNo.toLowerCase().includes(containerNo))))
+    && (!containerNo || Boolean(current?.lines.some((line) => line.containerNo?.toLowerCase().includes(containerNo))))
     && inDateRange(row.periodStart, 'periodStartRange')
     && inDateRange(row.periodEnd, 'periodEndRange')
     && inDateRange(row.lastPaymentAt, 'lastPaymentRange')
     && inDateRange(row.createdAt || '', 'createdRange')
 }))
 
-async function hydrateLineSources(current: FinanceReconciliationDetail) {
-  if (!canViewFeeSource.value) return
-  await Promise.all(current.lines.map(async (line) => {
-    if (!line.sourceFeeId || lineSourceCache.has(line.sourceFeeId)) return
-    try {
-      const source = await getFinanceFeeSource(line.sourceFeeId)
-      lineSourceCache.set(line.sourceFeeId, {
-        containerNo: source.containerNo, inboundCode: source.inboundCode, businessDate: source.businessDate,
-        quantity: source.quantity, unitPrice: source.unitPrice, sourceType: source.sourceType,
-      })
-    } catch {
-      lineSourceCache.set(line.sourceFeeId, { containerNo: '', inboundCode: '', businessDate: '', quantity: null, unitPrice: null, sourceType: '' })
-    }
-  }))
-}
-
 async function loadCustomers() {
   if (!canListCustomers.value) return
   customerError.value = null
@@ -249,7 +235,6 @@ async function load(model?: QueryModel) {
   selectedId.value = ''
   detail.value = null
   detailCache.clear()
-  lineSourceCache.clear()
   error.value = null
   loading.value = true
   try {
@@ -260,7 +245,6 @@ async function load(model?: QueryModel) {
       try {
         const current = await getReconciliationStatement(row.id)
         detailCache.set(row.id, current)
-        await hydrateLineSources(current)
         return detailToRow(row, current)
       } catch (cause) {
         detailErrors.push(getApiErrorDetails(cause, `对账单 ${row.billNo || row.id} 的筛选字段加载失败`))
@@ -283,7 +267,6 @@ async function fetchDetail(statementId: string, force = false) {
   if (!force && detailCache.has(statementId)) return detailCache.get(statementId)!
   const current = await getReconciliationStatement(statementId)
   detailCache.set(statementId, current)
-  await hydrateLineSources(current)
   return current
 }
 
@@ -321,6 +304,14 @@ function revisionActionLabel(action: string) {
   return ({ SUBMIT: '提交审核', APPROVE: '审核通过', REJECT: '审核驳回', ISSUE: '出账', ADJUST: '调整', VOID: '作废', REOPEN: '重开' } as Record<string, string>)[action] || action || '—'
 }
 
+function revisionTime(actions: string[]) {
+  return detail.value?.revisions.filter((item) => actions.includes(item.action)).map((item) => item.occurredAt).sort().at(-1) || ''
+}
+
+function detailSourceAmount() {
+  return detail.value?.lines.reduce((total, line) => total + (line.sourceAmount ?? line.amount), 0) ?? 0
+}
+
 async function exportStatements() {
   const customerId = String(filters.value.customerId || '').trim()
   if (customerId && !/^[1-9]\d*$/.test(customerId)) return ElMessage.error('客户业务标识无效，无法创建导出任务')
@@ -461,10 +452,16 @@ watch(detailRouteId, (statementId) => {
             <div class="statement-summary-item"><span>已收金额</span><strong>{{ detail.paidAmount.toFixed(2) }} CNY</strong></div>
             <div class="statement-summary-item"><span>未收金额</span><strong class="statement-outstanding">{{ detail.outstandingAmount.toFixed(2) }} CNY</strong></div>
             <div class="statement-summary-item"><span>账期</span><strong>{{ detail.creditDays }} 天</strong></div>
+            <div class="statement-summary-item"><span>费用明细 / 来源</span><strong>{{ detail.lines.length }} / {{ new Set(detail.lines.map((line) => line.sourceFeeId)).size }}</strong></div>
+            <div class="statement-summary-item"><span>调整前金额</span><strong>{{ detailSourceAmount().toFixed(2) }} CNY</strong></div>
+            <div class="statement-summary-item"><span>调整金额</span><strong>{{ (detail.totalAmount - detailSourceAmount()).toFixed(2) }} CNY</strong></div>
             <div class="statement-summary-item"><span>货币</span><strong>{{ detail.currency }}</strong></div>
             <div class="statement-summary-item"><span>是否结清</span><strong>{{ detail.settled ? '是' : '否' }}</strong></div>
             <div class="statement-summary-item"><span>创建人</span><strong>{{ operatorDisplayName(detail.createdByName) }}</strong></div>
             <div class="statement-summary-item"><span>创建时间</span><strong>{{ formatDateTime(detail.createdAt) }}</strong></div>
+            <div class="statement-summary-item"><span>提交时间</span><strong>{{ formatDateTime(revisionTime(['SUBMIT'])) }}</strong></div>
+            <div class="statement-summary-item"><span>审核时间</span><strong>{{ formatDateTime(revisionTime(['APPROVE', 'REJECT'])) }}</strong></div>
+            <div class="statement-summary-item"><span>出账时间</span><strong>{{ formatDateTime(revisionTime(['ISSUE'])) }}</strong></div>
             <div class="statement-summary-item"><span>更新人</span><strong>{{ operatorDisplayName(detail.updatedByName) }}</strong></div>
             <div class="statement-summary-item"><span>更新时间</span><strong>{{ formatDateTime(detail.updatedAt) }}</strong></div>
             <div class="statement-summary-item statement-summary-item--remark"><span>备注</span><strong>{{ detail.remark || '—' }}</strong></div>
@@ -478,11 +475,14 @@ watch(detailRouteId, (statementId) => {
           <FormSection v-else-if="detail" title="账单明细" :bordered="false">
             <div class="detail-table-scroll">
               <DataTable class="statement-detail-table statement-line-table" :data="detail.lines" size="small" border stripe :columns="detailLineColumns" column-settings-mode="hide" row-key="statementLineId" empty-text="该对账单暂无账单明细" aria-label="客户对账单账单明细">
-                <template #inboundCode="{ row }">{{ lineSourceCache.get(row.sourceFeeId)?.inboundCode || row.inboundId || '—' }}</template>
-                <template #containerNo="{ row }">{{ lineSourceCache.get(row.sourceFeeId)?.containerNo || (row.containerId ? `柜次ID ${row.containerId}` : '—') }}</template>
-                <template #businessDate="{ row }">{{ lineSourceCache.get(row.sourceFeeId)?.businessDate || '—' }}</template>
-                <template #quantity="{ row }">{{ lineSourceCache.get(row.sourceFeeId)?.quantity ?? '—' }}</template>
-                <template #unitPrice="{ row }">{{ lineSourceCache.get(row.sourceFeeId)?.unitPrice ?? '—' }}</template>
+                <template #direction="{ row }">{{ row.direction === 'PAYABLE' ? '应付' : '应收' }}</template>
+                <template #sourceType="{ row }">{{ financeSourceTypeLabel(row.sourceType) }}</template>
+                <template #orderId="{ row }">{{ row.orderId ? `订单 ${row.orderId}` : '—' }}</template>
+                <template #inboundCode="{ row }">{{ row.inboundCode || '—' }}</template>
+                <template #containerNo="{ row }">{{ row.containerNo || '—' }}</template>
+                <template #businessDate="{ row }">{{ row.businessDate || '—' }}</template>
+                <template #quantity="{ row }">{{ row.quantity ?? '—' }}</template>
+                <template #unitPrice="{ row }">{{ row.unitPrice ?? '—' }}</template>
                 <template #billNo>{{ detail.billNo }}</template>
                 <template #periodStart>{{ detail.periodStart || '—' }}</template>
                 <template #periodEnd>{{ detail.periodEnd || '—' }}</template>
@@ -498,6 +498,7 @@ watch(detailRouteId, (statementId) => {
                 <template #customerName>{{ customerDisplayName(detail.customerId, detail.customerName) }}</template>
                 <template #transactionDate="{ row }">{{ formatDateTime(row.transactionDate).slice(0, 10) }}</template>
                 <template #method="{ row }">{{ paymentMethodLabel(row.method) }}</template>
+                <template #voucherFileIds="{ row }">{{ row.voucherFileIds.length ? `${row.voucherFileIds.length} 个附件` : (row.referenceNo || '—') }}</template>
                 <template #createdByName="{ row }">{{ operatorDisplayName(row.createdByName) }}</template>
                 <template #occurredAt="{ row }">{{ formatDateTime(row.occurredAt) }}</template>
               </DataTable>
@@ -535,6 +536,9 @@ watch(detailRouteId, (statementId) => {
             <template #settled="{ row }"><el-tag v-if="row.settled !== null" :type="row.settled ? 'success' : 'warning'">{{ row.settled ? '是' : '否' }}</el-tag><span v-else>—</span></template>
             <template #createdByName="{ row }">{{ operatorDisplayName(row.createdByName) }}</template>
             <template #createdAt="{ row }">{{ formatDateTime(row.createdAt) }}</template>
+            <template #submittedAt="{ row }">{{ formatDateTime(row.submittedAt) }}</template>
+            <template #reviewedAt="{ row }">{{ formatDateTime(row.reviewedAt) }}</template>
+            <template #issuedAt="{ row }">{{ formatDateTime(row.issuedAt) }}</template>
             <template #updatedByName="{ row }">{{ operatorDisplayName(row.updatedByName) }}</template>
             <template #updatedAt="{ row }">{{ formatDateTime(row.updatedAt) }}</template>
             <template #pagination-left>共 {{ filteredRows.length }} 条 · 币种：CNY</template>