优化

2026-08-14 14:27:03 +08:00
parent 724848feb6
commit a81af4a664
64 changed files with 961 additions and 176 deletions
@@ -98,7 +98,7 @@ const columns: DataTableColumn[] = [
  { key: 'actions', label: '操作', width: 280, fixed: 'left', slotName: 'actions' },
  { key: 'status', label: '审核状态', width: 120, slotName: 'status' },
  { key: 'billNo', label: '对账单号', minWidth: 180 },
-  { key: 'customerName', label: '客户', minWidth: 180 },
+  { key: 'customerName', label: '客户', minWidth: 180, slotName: 'customerName' },
  { key: 'periodStart', label: '结算起始日', width: 130 },
  { key: 'periodEnd', label: '结算结束日', width: 130 },
  { key: 'creditDays', label: '账期(天)', width: 100 },
@@ -106,15 +106,39 @@ const columns: DataTableColumn[] = [
  { key: 'totalAmount', label: '总应收金额(CNY)', width: 155 },
  { key: 'receivedAmount', label: '已收金额(CNY)', width: 145 },
  { key: 'outstandingAmount', label: '未收金额(CNY)', width: 145 },
-  { key: 'lastPaymentAt', label: '最后收款时间', minWidth: 170 },
+  { key: 'lastPaymentAt', label: '最后收款时间', minWidth: 170, slotName: 'lastPaymentAt' },
  { key: 'settled', label: '是否结清', width: 100, slotName: 'settled' },
  { key: 'remark', label: '备注', minWidth: 180 },
-  { key: 'createdBy', label: '创建人', width: 110 },
-  { key: 'createdAt', label: '创建时间', minWidth: 170 },
-  { key: 'updatedBy', label: '更新人', width: 110 },
-  { key: 'updatedAt', label: '更新时间', minWidth: 170 },
+  { key: 'createdBy', label: '创建人', width: 130, slotName: 'createdBy' },
+  { key: 'createdAt', label: '创建时间', minWidth: 170, slotName: 'createdAt' },
+  { key: 'updatedBy', label: '更新人', width: 130, slotName: 'updatedBy' },
+  { key: 'updatedAt', label: '更新时间', minWidth: 170, slotName: 'updatedAt' },
 ]

+const customerNameById = computed(() => new Map(customers.value.map((item) => [String(item.id), item.tenantName.trim()])))
+
+function isInternalCustomerLabel(value: string, customerId: string) {
+  const normalized = value.replaceAll(' ', '')
+  return normalized === customerId || /^客户(?:ID)?\d+$/.test(normalized)
+}
+
+function customerDisplayName(customerId: string, value?: string) {
+  const resolved = customerNameById.value.get(String(customerId))
+  if (resolved) return resolved
+  const candidate = String(value || '').trim()
+  return candidate && !isInternalCustomerLabel(candidate, String(customerId)) ? candidate : '客户名称未提供'
+}
+
+function operatorDisplayName(value?: string) {
+  const candidate = String(value || '').trim()
+  if (!candidate) return '系统'
+  return /^\d+$/.test(candidate) ? '操作人信息缺失' : candidate
+}
+
+function formatDateTime(value?: string) {
+  return value ? value.replace('T', ' ').replace(/Z$/, '').slice(0, 16) : '—'
+}
+
 function detailToRow(row: FinanceStatementReadModel, current?: FinanceReconciliationDetail): StatementRow {
  const latestPayment = current?.paymentHistory.map((item) => item.occurredAt || item.transactionDate).filter(Boolean).sort().at(-1) || ''
  return {
@@ -277,7 +301,7 @@ async function exportStatements() {
    return
  }
  const header = ['审核状态', '对账单号', '客户', '结算起始日', '结算结束日', '账期(天)', '货币', '总应收金额', '已收金额', '未收金额', '最后收款时间', '是否结清', '备注', '创建人', '创建时间', '更新人', '更新时间']
-  const body = filteredRows.value.map((row) => [financeStatusLabel(row.status), row.billNo, row.customerName, row.periodStart, row.periodEnd, row.creditDays ?? '', row.currency, row.totalAmount, row.receivedAmount, row.outstandingAmount, row.lastPaymentAt, row.settled === null ? '' : (row.settled ? '是' : '否'), row.remark, row.createdBy || '', row.createdAt || '', row.updatedBy || '', row.updatedAt || ''])
+  const body = filteredRows.value.map((row) => [financeStatusLabel(row.status), row.billNo, customerDisplayName(row.customerId, row.customerName), row.periodStart, row.periodEnd, row.creditDays ?? '', row.currency, row.totalAmount, row.receivedAmount, row.outstandingAmount, formatDateTime(row.lastPaymentAt), row.settled === null ? '' : (row.settled ? '是' : '否'), row.remark, operatorDisplayName(row.createdBy), formatDateTime(row.createdAt), operatorDisplayName(row.updatedBy), formatDateTime(row.updatedAt)])
  const blob = new Blob([`\uFEFF${[header, ...body].map((line) => line.map(csvCell).join(',')).join('\r\n')}`], { type: 'text/csv;charset=utf-8' })
  const url = URL.createObjectURL(blob)
  const anchor = document.createElement('a')
@@ -383,14 +407,20 @@ onMounted(() => { if (canListCustomers.value) void loadCustomers(); void load()
              <el-button v-if="['DRAFT','APPROVED','ISSUED'].includes(String(row.status)) && canVoid" link type="danger" :loading="actionBusy" @click.stop="performAction(row as FinanceStatementReadModel, 'VOID')"><XCircle :size="15" />作废</el-button>
            </template>
            <template #status="{ row }"><el-tag :type="financeStatusTone(row.status)">{{ financeStatusLabel(row.status) }}</el-tag></template>
+            <template #customerName="{ row }">{{ customerDisplayName(row.customerId, row.customerName) }}</template>
+            <template #lastPaymentAt="{ row }">{{ formatDateTime(row.lastPaymentAt) }}</template>
            <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 #createdBy="{ row }">{{ operatorDisplayName(row.createdBy) }}</template>
+            <template #createdAt="{ row }">{{ formatDateTime(row.createdAt) }}</template>
+            <template #updatedBy="{ row }">{{ operatorDisplayName(row.updatedBy) }}</template>
+            <template #updatedAt="{ row }">{{ formatDateTime(row.updatedAt) }}</template>
            <template #pagination-left>共 {{ filteredRows.length }} 条 · 币种：CNY</template>
          </DataTable>
        </section>

        <section class="surface-panel statement-detail-panel" aria-label="所选对账单联动明细">
          <header class="statement-detail-header">
-            <div><strong>已选择 {{ selectedId ? 1 : 0 }} 项</strong><span v-if="detail">{{ detail.billNo }} · {{ detail.customerName }}</span></div>
+            <div><strong>已选择 {{ selectedId ? 1 : 0 }} 项</strong><span v-if="detail">{{ detail.billNo }} · {{ customerDisplayName(detail.customerId, detail.customerName) }}</span></div>
            <el-button v-if="selectedId" link @click="clearSelection">清空</el-button>
          </header>
          <el-tabs v-model="activeDetailTab">
@@ -400,7 +430,7 @@ onMounted(() => { if (canListCustomers.value) void loadCustomers(); void load()
              <template v-else-if="detail">
                <el-table :data="detail.lines" size="small" border stripe empty-text="该对账单暂无账单明细">
                  <el-table-column label="应收/应付" width="110"><template #default>应收</template></el-table-column>
-                  <el-table-column label="客户" min-width="170"><template #default>{{ detail.customerName }}</template></el-table-column>
+                  <el-table-column label="客户" min-width="170"><template #default>{{ customerDisplayName(detail.customerId, detail.customerName) }}</template></el-table-column>
                  <el-table-column label="入仓号" min-width="140"><template #default="{ row }">{{ lineSourceCache.get(row.sourceFeeId)?.inboundCode || row.inboundId || '—' }}</template></el-table-column>
                  <el-table-column label="柜次号" min-width="140"><template #default="{ row }">{{ lineSourceCache.get(row.sourceFeeId)?.containerNo || (row.containerId ? `柜次ID ${row.containerId}` : '—') }}</template></el-table-column>
                  <el-table-column label="业务发生日" width="130"><template #default="{ row }">{{ lineSourceCache.get(row.sourceFeeId)?.businessDate || '—' }}</template></el-table-column>
@@ -418,18 +448,19 @@ onMounted(() => { if (canListCustomers.value) void loadCustomers(); void load()
                  <el-table-column label="结算起始日" width="130"><template #default>{{ detail.periodStart || '—' }}</template></el-table-column>
                  <el-table-column label="结算结束日" width="130"><template #default>{{ detail.periodEnd || '—' }}</template></el-table-column>
                </el-table>
-                <el-collapse v-if="detail.revisions.length" class="revision-collapse"><el-collapse-item title="调整记录" name="revisions"><el-table :data="detail.revisions" size="small" border stripe><el-table-column prop="revisionNo" label="修订" width="72" /><el-table-column label="动作" width="130"><template #default="{ row }">{{ revisionActionLabel(row.action) }}</template></el-table-column><el-table-column prop="beforeAmount" label="调整前" /><el-table-column prop="afterAmount" label="调整后" /><el-table-column prop="reason" label="原因" /><el-table-column prop="occurredAt" label="发生时间" min-width="170" /></el-table></el-collapse-item></el-collapse>
+                <el-collapse v-if="detail.revisions.length" class="revision-collapse"><el-collapse-item title="调整记录" name="revisions"><el-table :data="detail.revisions" size="small" border stripe><el-table-column prop="revisionNo" label="修订" width="72" /><el-table-column label="动作" width="130"><template #default="{ row }">{{ revisionActionLabel(row.action) }}</template></el-table-column><el-table-column prop="beforeAmount" label="调整前" /><el-table-column prop="afterAmount" label="调整后" /><el-table-column prop="reason" label="原因" /><el-table-column label="发生时间" min-width="170"><template #default="{ row }">{{ formatDateTime(row.occurredAt) }}</template></el-table-column></el-table></el-collapse-item></el-collapse>
              </template>
              <el-empty v-else description="请在主表中选择一张对账单" />
            </el-tab-pane>
            <el-tab-pane label="账单支付历史表" name="payments">
              <el-table v-if="detail" :data="detail.paymentHistory" size="small" border stripe empty-text="该对账单暂无有效收款记录">
-                <el-table-column prop="transactionDate" label="支付日期" min-width="130" />
+                <el-table-column label="客户" min-width="170"><template #default>{{ customerDisplayName(detail.customerId, detail.customerName) }}</template></el-table-column>
+                <el-table-column label="支付日期" min-width="130"><template #default="{ row }">{{ formatDateTime(row.transactionDate).slice(0, 10) }}</template></el-table-column>
                <el-table-column prop="amount" label="支付金额(CNY)" min-width="150" />
                <el-table-column label="支付方式" min-width="130"><template #default="{ row }">{{ paymentMethodLabel(row.method) }}</template></el-table-column>
                <el-table-column prop="referenceNo" label="支付流水号" min-width="170" />
-                <el-table-column prop="createdBy" label="登记人" min-width="130" />
-                <el-table-column prop="occurredAt" label="登记时间" min-width="170" />
+                <el-table-column label="登记人" min-width="130"><template #default="{ row }">{{ operatorDisplayName(row.createdBy) }}</template></el-table-column>
+                <el-table-column label="登记时间" min-width="170"><template #default="{ row }">{{ formatDateTime(row.occurredAt) }}</template></el-table-column>
                <el-table-column prop="remark" label="备注" min-width="180" />
              </el-table>
              <el-empty v-else description="请在主表中选择一张对账单" />