优化

2026-08-17 19:52:04 +08:00
parent d618683467
commit ee4cd35927
42 changed files with 702 additions and 226 deletions
@@ -127,30 +127,53 @@ const columns = computed<DataTableColumn[]>(() => props.kind === 'receivable'
      { key: 'actions', label: '操作', width: 190, fixed: 'left', slotName: 'actions' },
      { key: 'settlementNo', label: '结算单号', minWidth: 180 },
      { key: 'customerId', label: '客户', minWidth: 180, slotName: 'customer' },
+      { key: 'feeItemSummary', label: '费用类型', minWidth: 150, slotName: 'feeItemSummary' },
      { key: 'currency', label: '币种', width: 80 },
      { key: 'receivableAmount', label: '应收金额', width: 130, slotName: 'money' },
      { key: 'receivedAmount', label: '已收', width: 120, slotName: 'paidMoney' },
      { key: 'outstandingAmount', label: '余额', width: 120, slotName: 'outstandingMoney' },
-      { key: 'billDate', label: '生成日期', width: 130, slotName: 'billDate' },
+      { key: 'reconciliationStatementNo', label: '关联对账单', minWidth: 180, slotName: 'reconciliationStatementNo' },
+      { key: 'businessPeriod', label: '结算周期', width: 120, slotName: 'businessPeriod' },
+      { key: 'generatedDate', label: '生成日期', width: 130, slotName: 'generatedDate' },
      { key: 'dueDate', label: '到期日', width: 130, slotName: 'dueDate' },
-      { key: 'status', label: '收款状态', width: 120, slotName: 'status' },
+      { key: 'paymentStatus', label: '收款状态', width: 120, slotName: 'paymentStatus' },
+      { key: 'createdByName', label: '制单人', minWidth: 130, slotName: 'createdByName' },
+      { key: 'createdAt', label: '创建时间', width: 170, slotName: 'createdAt' },
+      { key: 'lastPaymentAt', label: '最后收款时间', width: 170, slotName: 'lastPaymentAt' },
+      { key: 'status', label: '结算状态', width: 120, slotName: 'settlementStatus' },
    ]
  : [
      { key: 'actions', label: '操作', width: 190, fixed: 'left', slotName: 'actions' },
      { key: 'settlementNo', label: '结算单号', minWidth: 180 },
      { key: 'supplierName', label: '供应商', minWidth: 180, slotName: 'supplier' },
-      { key: 'feeItemName', label: '费用类型', minWidth: 150, slotName: 'feeType' },
+      { key: 'customerId', label: '客户', minWidth: 180, slotName: 'customer' },
+      { key: 'feeItemSummary', label: '费用类型', minWidth: 150, slotName: 'feeItemSummary' },
      { key: 'currency', label: '币种', width: 80 },
      { key: 'payableAmount', label: '应付金额', width: 130, slotName: 'money' },
      { key: 'paidAmount', label: '已付', width: 120, slotName: 'paidMoney' },
      { key: 'outstandingAmount', label: '余额', width: 120, slotName: 'outstandingMoney' },
-      { key: 'createdAt', label: '生成日期', width: 130, slotName: 'createdAt' },
-      { key: 'status', label: '付款状态', width: 120, slotName: 'status' },
+      { key: 'businessPeriod', label: '结算周期', width: 120, slotName: 'businessPeriod' },
+      { key: 'generatedDate', label: '生成日期', width: 130, slotName: 'generatedDate' },
+      { key: 'dueDate', label: '到期日', width: 130, slotName: 'dueDate' },
+      { key: 'paymentStatus', label: '付款状态', width: 120, slotName: 'paymentStatus' },
+      { key: 'createdByName', label: '制单人', minWidth: 130, slotName: 'createdByName' },
+      { key: 'createdAt', label: '创建时间', width: 170, slotName: 'createdAt' },
+      { key: 'lastPaymentAt', label: '最后付款时间', width: 170, slotName: 'lastPaymentAt' },
+      { key: 'status', label: '结算状态', width: 120, slotName: 'settlementStatus' },
    ])

 function money(value: number) { return `¥${Number(value || 0).toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}` }
 function displayDate(value?: string) { return value || '—' }
 function displayDateTime(value?: string) { return value ? value.replace('T', ' ').slice(0, 16) : '—' }
+function settlementPaymentStatusLabel(status?: string) {
+  if (status === 'UNPAID') return props.kind === 'receivable' ? '待收款' : '待付款'
+  if (status === 'PARTIALLY_PAID') return props.kind === 'receivable' ? '部分收款' : '部分付款'
+  if (status === 'PAID') return '已结清'
+  return '—'
+}
+function paymentMethodLabel(method?: string) {
+  return ({ BANK_TRANSFER: '银行转账', CASH: '现金', OTHER: '其他' } as Record<string, string>)[String(method || '')] || '—'
+}
 function operatorDisplayName(value?: string) {
  const candidate = String(value || '').trim()
  return candidate && !/^(?:operator-)?\d+$/i.test(candidate) ? candidate : '名称数据缺失'
@@ -488,12 +511,18 @@ onMounted(() => {
          <el-descriptions :column="4" class="settlement-detail-info">
            <el-descriptions-item label="结算单号">{{ detail.settlementNo }}</el-descriptions-item>
            <el-descriptions-item :label="kind === 'receivable' ? '客户' : '供应商'">{{ detailPartyName() }}</el-descriptions-item>
+            <el-descriptions-item v-if="kind === 'payable'" label="客户">{{ customerName(detail.customerId, detail.customerName) }}</el-descriptions-item>
            <el-descriptions-item label="币种">CNY</el-descriptions-item>
-            <el-descriptions-item label="收付款状态"><el-tag :type="financeStatusTone(detail.status)">{{ financeStatusLabel(detail.status) }}</el-tag></el-descriptions-item>
-            <el-descriptions-item label="关联账单">{{ detail.reconciliationStatementId || '—' }}</el-descriptions-item>
-            <el-descriptions-item label="业务期间">{{ detail.businessPeriod || '—' }}</el-descriptions-item>
+            <el-descriptions-item :label="kind === 'receivable' ? '收款状态' : '付款状态'"><el-tag :type="financeStatusTone(detail.paymentStatus)">{{ settlementPaymentStatusLabel(detail.paymentStatus) }}</el-tag></el-descriptions-item>
+            <el-descriptions-item label="结算状态"><el-tag :type="financeStatusTone(detail.status)">{{ financeStatusLabel(detail.status) }}</el-tag></el-descriptions-item>
+            <el-descriptions-item label="关联对账单">{{ detail.reconciliationStatementNo || '—' }}</el-descriptions-item>
+            <el-descriptions-item label="结算周期">{{ detail.businessPeriod || '—' }}</el-descriptions-item>
+            <el-descriptions-item label="费用类型">{{ detail.feeItemSummary || '—' }}</el-descriptions-item>
            <el-descriptions-item label="生成日期">{{ displayDate(detail.generatedDate) }}</el-descriptions-item>
            <el-descriptions-item label="到期日">{{ displayDate(detail.dueDate) }}</el-descriptions-item>
+            <el-descriptions-item label="制单人">{{ operatorDisplayName(detail.createdByName) }}</el-descriptions-item>
+            <el-descriptions-item label="创建时间">{{ displayDateTime(detail.createdAt) }}</el-descriptions-item>
+            <el-descriptions-item :label="kind === 'receivable' ? '最后收款时间' : '最后付款时间'">{{ displayDateTime(detail.lastPaymentAt) }}</el-descriptions-item>
          </el-descriptions>
        </FormSection>
        <FormSection title="费用明细">
@@ -501,6 +530,7 @@ onMounted(() => {
          <el-table :data="detail.lines" size="small" border stripe empty-text="暂无费用明细">
            <el-table-column prop="feeItemName" label="费用类型" min-width="150" />
            <el-table-column prop="sourceType" label="来源类型" min-width="140"><template #default="scope">{{ financeSourceTypeLabel(scope.row.sourceType) }}</template></el-table-column>
+            <el-table-column prop="orderNo" label="订单号" min-width="160"><template #default="scope">{{ scope.row.orderNo || '—' }}</template></el-table-column>
            <el-table-column prop="inboundCode" label="入仓码" min-width="130"><template #default="scope">{{ scope.row.inboundCode || '—' }}</template></el-table-column>
            <el-table-column prop="containerNo" label="柜次号" min-width="130"><template #default="scope">{{ scope.row.containerNo || '—' }}</template></el-table-column>
            <el-table-column prop="businessDate" label="业务发生日" width="120"><template #default="scope">{{ displayDate(scope.row.businessDate) }}</template></el-table-column>
@@ -513,11 +543,11 @@ onMounted(() => {
          <el-table :data="detail.transactions" size="small" border stripe :empty-text="kind === 'receivable' ? '暂无收款记录' : '暂无付款记录'">
            <el-table-column prop="transactionDate" :label="kind === 'receivable' ? '收款日期' : '付款日期'" width="130" />
            <el-table-column prop="amount" label="金额(CNY)" width="130" align="right"><template #default="scope">{{ money(scope.row.amount) }}</template></el-table-column>
-            <el-table-column prop="method" :label="kind === 'receivable' ? '收款方式' : '付款方式'" min-width="130" />
-            <el-table-column prop="referenceNo" label="支付流水号" min-width="160"><template #default="scope">{{ scope.row.referenceNo || '—' }}</template></el-table-column>
+            <el-table-column prop="method" :label="kind === 'receivable' ? '收款方式' : '付款方式'" min-width="130"><template #default="scope">{{ paymentMethodLabel(scope.row.method) }}</template></el-table-column>
+            <el-table-column prop="referenceNo" label="银行流水号/凭证号" min-width="180"><template #default="scope">{{ scope.row.referenceNo || '—' }}</template></el-table-column>
            <el-table-column label="登记人" min-width="140"><template #default="scope">{{ operatorDisplayName(scope.row.createdByName) }}</template></el-table-column>
            <el-table-column label="登记时间" min-width="170"><template #default="scope">{{ displayDateTime(scope.row.createdAt) }}</template></el-table-column>
-            <el-table-column label="凭证" width="100"><template #default="scope">{{ scope.row.voucherFileIds.length ? `${scope.row.voucherFileIds.length} 个` : '—' }}</template></el-table-column>
+            <el-table-column label="凭证" width="130"><template #default="scope">{{ scope.row.voucherFileIds.length ? `已上传 ${scope.row.voucherFileIds.length} 个` : '—' }}</template></el-table-column>
            <el-table-column prop="remark" label="备注" min-width="180"><template #default="scope">{{ scope.row.remark || '—' }}</template></el-table-column>
          </el-table>
          </div>
@@ -566,14 +596,19 @@ onMounted(() => {
            </template>
            <template #customer="{ row }">{{ customerName(String(row.customerId), row.customerName) }}</template>
            <template #supplier="{ row }">{{ row.supplierName || '—' }}</template>
-            <template #feeType="{ row }">{{ row.feeItemName || '详见费用明细' }}</template>
+            <template #feeItemSummary="{ row }">{{ row.feeItemSummary || '—' }}</template>
            <template #money="{ row }">{{ money(rowTotal(row)) }}</template>
            <template #paidMoney="{ row }">{{ money(rowPaid(row)) }}</template>
            <template #outstandingMoney="{ row }">{{ money(rowOutstanding(row)) }}</template>
-            <template #billDate="{ row }">{{ displayDate((row as FinanceReceivableSettlement).billDate) }}</template>
+            <template #reconciliationStatementNo="{ row }">{{ row.reconciliationStatementNo || '—' }}</template>
+            <template #businessPeriod="{ row }">{{ row.businessPeriod || '—' }}</template>
+            <template #generatedDate="{ row }">{{ displayDate(row.generatedDate) }}</template>
            <template #dueDate="{ row }">{{ displayDate((row as FinanceReceivableSettlement).dueDate) }}</template>
-            <template #createdAt="{ row }">{{ displayDate((row as FinancePayableSettlement).createdAt) }}</template>
-            <template #status="{ row }"><el-tag :type="financeStatusTone(row.status)">{{ financeStatusLabel(row.status) }}</el-tag></template>
+            <template #paymentStatus="{ row }"><el-tag :type="financeStatusTone(row.paymentStatus)">{{ settlementPaymentStatusLabel(row.paymentStatus) }}</el-tag></template>
+            <template #createdByName="{ row }">{{ operatorDisplayName(row.createdByName) }}</template>
+            <template #createdAt="{ row }">{{ displayDateTime(row.createdAt) }}</template>
+            <template #lastPaymentAt="{ row }">{{ displayDateTime(row.lastPaymentAt) }}</template>
+            <template #settlementStatus="{ row }"><el-tag :type="financeStatusTone(row.status)">{{ financeStatusLabel(row.status) }}</el-tag></template>
            <template #pagination-left>共 {{ filteredRows.length }} 条 · 币种：CNY</template>
          </DataTable>
        </section>