refactor: 收款流水未匹配金额字段名统一为unmatchAmountRec
This commit is contained in:
@@ -12,7 +12,7 @@ export const receiptFlowTableColumns = [
|
|||||||
{ prop: 'transactionTime', label: '交易时间', minWidth: 170 },
|
{ prop: 'transactionTime', label: '交易时间', minWidth: 170 },
|
||||||
{ prop: 'claimStatusName', label: '认领状态', minWidth: 110, status: true },
|
{ prop: 'claimStatusName', label: '认领状态', minWidth: 110, status: true },
|
||||||
{ prop: 'claimedAmount', label: '已认领金额', minWidth: 130, money: true },
|
{ prop: 'claimedAmount', label: '已认领金额', minWidth: 130, money: true },
|
||||||
{ prop: 'unclaimedAmount', label: '未匹配金额', minWidth: 140, money: true },
|
{ prop: 'unmatchAmountRec', label: '未匹配金额', minWidth: 140, money: true },
|
||||||
{ prop: 'matchAmountRec', label: '已匹配收款金额', minWidth: 140, money: true },
|
{ prop: 'matchAmountRec', label: '已匹配收款金额', minWidth: 140, money: true },
|
||||||
{ prop: 'matchAmountPay', label: '已匹配付款金额', minWidth: 140, money: true },
|
{ prop: 'matchAmountPay', label: '已匹配付款金额', minWidth: 140, money: true },
|
||||||
{ prop: 'unmatchAmountPay', label: '未匹配付款金额', minWidth: 140, money: true },
|
{ prop: 'unmatchAmountPay', label: '未匹配付款金额', minWidth: 140, money: true },
|
||||||
|
|||||||
@@ -44,7 +44,7 @@
|
|||||||
<template #default="{ row }">{{ formatMoney(row.claimedAmount) }}</template>
|
<template #default="{ row }">{{ formatMoney(row.claimedAmount) }}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="金蝶未认领金额" min-width="140" align="right">
|
<el-table-column label="金蝶未认领金额" min-width="140" align="right">
|
||||||
<template #default="{ row }">{{ formatMoney(row.unclaimedAmount) }}</template>
|
<template #default="{ row }">{{ formatMoney(row.unmatchAmountRec) }}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="剩余可认领金额" min-width="140" align="right">
|
<el-table-column label="剩余可认领金额" min-width="140" align="right">
|
||||||
<template #default="{ row }">{{ formatMoney(flowRemaining(row)) }}</template>
|
<template #default="{ row }">{{ formatMoney(flowRemaining(row)) }}</template>
|
||||||
@@ -302,7 +302,7 @@ export default {
|
|||||||
);
|
);
|
||||||
},
|
},
|
||||||
flowRemaining(flow) {
|
flowRemaining(flow) {
|
||||||
const unclaimed = Number(flow.unclaimedAmount || 0);
|
const unclaimed = Number(flow.unmatchAmountRec || 0);
|
||||||
const receipt = Number(flow.receiptAmount || 0);
|
const receipt = Number(flow.receiptAmount || 0);
|
||||||
const ceiling = unclaimed > 0 && receipt > 0 ? Math.min(unclaimed, receipt) : unclaimed || receipt;
|
const ceiling = unclaimed > 0 && receipt > 0 ? Math.min(unclaimed, receipt) : unclaimed || receipt;
|
||||||
return Math.max(ceiling - Number(flow.claimedAmount || 0), 0);
|
return Math.max(ceiling - Number(flow.claimedAmount || 0), 0);
|
||||||
@@ -356,7 +356,7 @@ export default {
|
|||||||
for (const flow of this.flows) {
|
for (const flow of this.flows) {
|
||||||
const total = this.flowAllocatedTotal(flow.id);
|
const total = this.flowAllocatedTotal(flow.id);
|
||||||
const remaining = Math.max(
|
const remaining = Math.max(
|
||||||
Number(flow.unclaimedAmount || 0) - Number(flow.claimedAmount || 0),
|
Number(flow.unmatchAmountRec || 0) - Number(flow.claimedAmount || 0),
|
||||||
0
|
0
|
||||||
);
|
);
|
||||||
if (total > remaining + 0.001) {
|
if (total > remaining + 0.001) {
|
||||||
|
|||||||
@@ -49,7 +49,7 @@
|
|||||||
></el-col>
|
></el-col>
|
||||||
<el-col :span="6"
|
<el-col :span="6"
|
||||||
><el-form-item label="未匹配金额"
|
><el-form-item label="未匹配金额"
|
||||||
><el-input :model-value="formatMoney(form.unclaimedAmount)" disabled /></el-form-item
|
><el-input :model-value="formatMoney(form.unmatchAmountRec)" disabled /></el-form-item
|
||||||
></el-col>
|
></el-col>
|
||||||
<el-col :span="6"
|
<el-col :span="6"
|
||||||
><el-form-item label="剩余可认领金额"
|
><el-form-item label="剩余可认领金额"
|
||||||
@@ -205,7 +205,7 @@ const emptyForm = () => ({
|
|||||||
transactionTime: '',
|
transactionTime: '',
|
||||||
detailSerialNo: '',
|
detailSerialNo: '',
|
||||||
claimedAmount: 0,
|
claimedAmount: 0,
|
||||||
unclaimedAmount: 0,
|
unmatchAmountRec: 0,
|
||||||
claimerName: '',
|
claimerName: '',
|
||||||
claimerDeptName: '',
|
claimerDeptName: '',
|
||||||
claimDate: '',
|
claimDate: '',
|
||||||
@@ -252,7 +252,7 @@ export default {
|
|||||||
);
|
);
|
||||||
},
|
},
|
||||||
claimableAmount() {
|
claimableAmount() {
|
||||||
const unclaimed = Number(this.form.unclaimedAmount || 0);
|
const unclaimed = Number(this.form.unmatchAmountRec || 0);
|
||||||
const receipt = Number(this.form.receiptAmount || 0);
|
const receipt = Number(this.form.receiptAmount || 0);
|
||||||
const ceiling =
|
const ceiling =
|
||||||
unclaimed > 0 && receipt > 0 ? Math.min(unclaimed, receipt) : unclaimed || receipt;
|
unclaimed > 0 && receipt > 0 ? Math.min(unclaimed, receipt) : unclaimed || receipt;
|
||||||
|
|||||||
@@ -214,7 +214,7 @@
|
|||||||
{{ formatMoney(detailDialog.data.remainingAmount) }}
|
{{ formatMoney(detailDialog.data.remainingAmount) }}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label="未匹配金额">
|
<el-descriptions-item label="未匹配金额">
|
||||||
{{ formatMoney(detailDialog.data.unclaimedAmount) }}
|
{{ formatMoney(detailDialog.data.unmatchAmountRec) }}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label="金蝶收款单号">
|
<el-descriptions-item label="金蝶收款单号">
|
||||||
{{ displayValue(detailDialog.data.kingdeeBillNo) }}
|
{{ displayValue(detailDialog.data.kingdeeBillNo) }}
|
||||||
|
|||||||
Reference in New Issue
Block a user