diff --git a/src/option/payment/receiptFlow.js b/src/option/payment/receiptFlow.js
index 5757f39..4ea9e3d 100644
--- a/src/option/payment/receiptFlow.js
+++ b/src/option/payment/receiptFlow.js
@@ -12,7 +12,7 @@ export const receiptFlowTableColumns = [
{ prop: 'transactionTime', label: '交易时间', minWidth: 170 },
{ prop: 'claimStatusName', label: '认领状态', minWidth: 110, status: 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: 'matchAmountPay', label: '已匹配付款金额', minWidth: 140, money: true },
{ prop: 'unmatchAmountPay', label: '未匹配付款金额', minWidth: 140, money: true },
diff --git a/src/views/payment/receipt-flow-batch-form.vue b/src/views/payment/receipt-flow-batch-form.vue
index 96efcee..a0cec3c 100644
--- a/src/views/payment/receipt-flow-batch-form.vue
+++ b/src/views/payment/receipt-flow-batch-form.vue
@@ -44,7 +44,7 @@
{{ formatMoney(row.claimedAmount) }}
- {{ formatMoney(row.unclaimedAmount) }}
+ {{ formatMoney(row.unmatchAmountRec) }}
{{ formatMoney(flowRemaining(row)) }}
@@ -302,7 +302,7 @@ export default {
);
},
flowRemaining(flow) {
- const unclaimed = Number(flow.unclaimedAmount || 0);
+ const unclaimed = Number(flow.unmatchAmountRec || 0);
const receipt = Number(flow.receiptAmount || 0);
const ceiling = unclaimed > 0 && receipt > 0 ? Math.min(unclaimed, receipt) : unclaimed || receipt;
return Math.max(ceiling - Number(flow.claimedAmount || 0), 0);
@@ -356,7 +356,7 @@ export default {
for (const flow of this.flows) {
const total = this.flowAllocatedTotal(flow.id);
const remaining = Math.max(
- Number(flow.unclaimedAmount || 0) - Number(flow.claimedAmount || 0),
+ Number(flow.unmatchAmountRec || 0) - Number(flow.claimedAmount || 0),
0
);
if (total > remaining + 0.001) {
diff --git a/src/views/payment/receipt-flow-form.vue b/src/views/payment/receipt-flow-form.vue
index 4022c6e..75549b6 100644
--- a/src/views/payment/receipt-flow-form.vue
+++ b/src/views/payment/receipt-flow-form.vue
@@ -49,7 +49,7 @@
>
({
transactionTime: '',
detailSerialNo: '',
claimedAmount: 0,
- unclaimedAmount: 0,
+ unmatchAmountRec: 0,
claimerName: '',
claimerDeptName: '',
claimDate: '',
@@ -252,7 +252,7 @@ export default {
);
},
claimableAmount() {
- const unclaimed = Number(this.form.unclaimedAmount || 0);
+ const unclaimed = Number(this.form.unmatchAmountRec || 0);
const receipt = Number(this.form.receiptAmount || 0);
const ceiling =
unclaimed > 0 && receipt > 0 ? Math.min(unclaimed, receipt) : unclaimed || receipt;
diff --git a/src/views/payment/receipt-flow.vue b/src/views/payment/receipt-flow.vue
index 70af645..29ad100 100644
--- a/src/views/payment/receipt-flow.vue
+++ b/src/views/payment/receipt-flow.vue
@@ -214,7 +214,7 @@
{{ formatMoney(detailDialog.data.remainingAmount) }}
- {{ formatMoney(detailDialog.data.unclaimedAmount) }}
+ {{ formatMoney(detailDialog.data.unmatchAmountRec) }}
{{ displayValue(detailDialog.data.kingdeeBillNo) }}