调整收付款问题
This commit is contained in:
@@ -407,8 +407,51 @@
|
||||
</el-table>
|
||||
</section-card>
|
||||
|
||||
<section-card v-if="readonly" title="付款信息">
|
||||
<el-table :data="paymentApplications" border>
|
||||
<section-card
|
||||
v-if="readonly"
|
||||
:title="form.settlementType === 'receivable' ? '收款信息' : '付款信息'"
|
||||
>
|
||||
<el-table
|
||||
v-if="form.settlementType === 'receivable'"
|
||||
:data="receiptClaims"
|
||||
border
|
||||
empty-text="暂无收款认领数据"
|
||||
>
|
||||
<el-table-column type="index" label="序号" width="64" align="center" />
|
||||
<el-table-column
|
||||
prop="receiptNoticeNo"
|
||||
label="认领通知单"
|
||||
min-width="160"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column prop="payerName" label="付款人" min-width="150" align="center">
|
||||
<template #default="{ row }">{{ displayValue(row.payerName) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="receiptAmount" label="收款金额" min-width="130" align="center">
|
||||
<template #default="{ row }">{{ formatMoney(row.receiptAmount) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="allocatedReceiptAmount"
|
||||
label="本次认领金额"
|
||||
min-width="145"
|
||||
align="center"
|
||||
>
|
||||
<template #default="{ row }">{{ formatMoney(row.allocatedReceiptAmount) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="transactionTime" label="交易时间" min-width="170" align="center">
|
||||
<template #default="{ row }">{{ displayValue(row.transactionTime) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="claimerName" label="认领人" min-width="120" align="center">
|
||||
<template #default="{ row }">{{ displayValue(row.claimerName) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="claimDate" label="认领日期" min-width="130" align="center">
|
||||
<template #default="{ row }">{{ displayValue(row.claimDate) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="claimStatusName" label="认领状态" min-width="120" align="center">
|
||||
<template #default="{ row }">{{ displayValue(row.claimStatusName) }}</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-table v-else :data="paymentApplications" border>
|
||||
<el-table-column type="index" label="序号" width="64" align="center" />
|
||||
<el-table-column prop="paymentTypeName" label="付款类型" min-width="120" align="center">
|
||||
<template #default="{ row }">{{ displayValue(row.paymentTypeName) }}</template>
|
||||
@@ -737,6 +780,7 @@ import {
|
||||
getDetailFees,
|
||||
getFeeOptions,
|
||||
getNextNo,
|
||||
getReceiptClaims,
|
||||
save,
|
||||
} from '@/api/settlement/formalSettlement';
|
||||
import { getDetail as getPreSettlementDetail } from '@/api/settlement/preSettlement';
|
||||
@@ -779,6 +823,7 @@ export default {
|
||||
details: [],
|
||||
summaryFees: [],
|
||||
paymentApplications: [],
|
||||
receiptClaims: [],
|
||||
adjustments: [],
|
||||
changeRecords: [],
|
||||
attachments: [],
|
||||
@@ -958,6 +1003,7 @@ export default {
|
||||
this.details = [];
|
||||
this.summaryFees = [];
|
||||
this.paymentApplications = [];
|
||||
this.receiptClaims = [];
|
||||
this.adjustments = [];
|
||||
this.changeRecords = [];
|
||||
this.attachments = [];
|
||||
@@ -1002,6 +1048,9 @@ export default {
|
||||
this.details = data.details || [];
|
||||
this.summaryFees = data.summaryFees || [];
|
||||
this.paymentApplications = data.paymentApplications || [];
|
||||
if (this.readonly && this.form.settlementType === 'receivable') {
|
||||
this.receiptClaims = this.unwrapData(await getReceiptClaims(this.recordId)) || [];
|
||||
}
|
||||
this.adjustments = data.adjustments || [];
|
||||
this.changeRecords = data.changeRecords || [];
|
||||
this.attachments = this.parseAttachments(data.attachmentsJson);
|
||||
@@ -1690,11 +1739,8 @@ export default {
|
||||
.filter(row => row.pendingDetailAdjustment)
|
||||
.map(row => ({
|
||||
sourcePreSettlementDetailId:
|
||||
row.sourcePreSettlementDetailId ||
|
||||
(row.sourcePreSettlementId ? row.id : undefined),
|
||||
sourceDetailId: row.sourcePreSettlementId
|
||||
? undefined
|
||||
: row.sourceDetailId || row.id,
|
||||
row.sourcePreSettlementDetailId || (row.sourcePreSettlementId ? row.id : undefined),
|
||||
sourceDetailId: row.sourcePreSettlementId ? undefined : row.sourceDetailId || row.id,
|
||||
adjustAmount: Number(row.adjustAmount || 0),
|
||||
})),
|
||||
exchangeRateDate: this.form.exchangeRateDate,
|
||||
|
||||
Reference in New Issue
Block a user