|
@@ -85,9 +85,9 @@
|
|
|
/>
|
|
/>
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
|
|
- <template v-slot:statementAdvanceConfirmAmount="scope">
|
|
|
|
|
|
|
+ <template v-slot:nowConfirmedPrepayAmt="scope">
|
|
|
<el-form-item
|
|
<el-form-item
|
|
|
- :prop="'payablesList.' + scope.$index + '.statementAdvanceConfirmAmount'"
|
|
|
|
|
|
|
+ :prop="'payablesList.' + scope.$index + '.nowConfirmedPrepayAmt'"
|
|
|
:rules="{
|
|
:rules="{
|
|
|
validator: (rule, value, cb) =>
|
|
validator: (rule, value, cb) =>
|
|
|
validateConfirmAmount(rule, value, cb, scope.row),
|
|
validateConfirmAmount(rule, value, cb, scope.row),
|
|
@@ -95,7 +95,7 @@
|
|
|
}"
|
|
}"
|
|
|
>
|
|
>
|
|
|
<el-input
|
|
<el-input
|
|
|
- v-model="scope.row.statementAdvanceConfirmAmount"
|
|
|
|
|
|
|
+ v-model="scope.row.nowConfirmedPrepayAmt"
|
|
|
type="number"
|
|
type="number"
|
|
|
:disabled="isView"
|
|
:disabled="isView"
|
|
|
@input="handleConfirmAmountChange(scope.row, scope.$index)"
|
|
@input="handleConfirmAmountChange(scope.row, scope.$index)"
|
|
@@ -236,18 +236,18 @@
|
|
|
// },
|
|
// },
|
|
|
// {
|
|
// {
|
|
|
// minWidth: 190,
|
|
// minWidth: 190,
|
|
|
- // prop: 'statementAdvanceConfirmAmount',
|
|
|
|
|
|
|
+ // prop: 'nowConfirmedPrepayAmt',
|
|
|
// label: '本次对账预付款确收金额',
|
|
// label: '本次对账预付款确收金额',
|
|
|
// align: 'center',
|
|
// align: 'center',
|
|
|
- // // slot: 'statementAdvanceConfirmAmount'
|
|
|
|
|
|
|
+ // // slot: 'nowConfirmedPrepayAmt'
|
|
|
// },
|
|
// },
|
|
|
{
|
|
{
|
|
|
minWidth: 190,
|
|
minWidth: 190,
|
|
|
headerSlot: 'columnRequired',
|
|
headerSlot: 'columnRequired',
|
|
|
- prop: 'statementAdvanceConfirmAmount',
|
|
|
|
|
|
|
+ prop: 'nowConfirmedPrepayAmt',
|
|
|
label: '本次对账预付款确收金额',
|
|
label: '本次对账预付款确收金额',
|
|
|
align: 'center',
|
|
align: 'center',
|
|
|
- slot: 'statementAdvanceConfirmAmount'
|
|
|
|
|
|
|
+ slot: 'nowConfirmedPrepayAmt'
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
minWidth: 160,
|
|
minWidth: 160,
|
|
@@ -287,7 +287,7 @@
|
|
|
return (
|
|
return (
|
|
|
this.localList.reduce(
|
|
this.localList.reduce(
|
|
|
(pre, cur) =>
|
|
(pre, cur) =>
|
|
|
- pre + Math.round((+cur.statementAdvanceConfirmAmount || 0) * 100),
|
|
|
|
|
|
|
+ pre + Math.round((+cur.nowConfirmedPrepayAmt || 0) * 100),
|
|
|
0
|
|
0
|
|
|
) / 100
|
|
) / 100
|
|
|
);
|
|
);
|
|
@@ -348,7 +348,7 @@
|
|
|
paymentConditionId: '',
|
|
paymentConditionId: '',
|
|
|
paymentConditionName: '',
|
|
paymentConditionName: '',
|
|
|
unreconciledAdvanceConfirmAmount: 0,
|
|
unreconciledAdvanceConfirmAmount: 0,
|
|
|
- statementAdvanceConfirmAmount: 0,
|
|
|
|
|
|
|
+ nowConfirmedPrepayAmt: 0,
|
|
|
lastPayableAmt: 0,
|
|
lastPayableAmt: 0,
|
|
|
statementAmount: 0,
|
|
statementAmount: 0,
|
|
|
payablePrice: 0,
|
|
payablePrice: 0,
|
|
@@ -372,11 +372,11 @@
|
|
|
},
|
|
},
|
|
|
handleConfirmAmountChange(row, index) {
|
|
handleConfirmAmountChange(row, index) {
|
|
|
// 限制本次确收金额不能超过未对账金额和本次对账金额
|
|
// 限制本次确收金额不能超过未对账金额和本次对账金额
|
|
|
- let val = +row.statementAdvanceConfirmAmount || 0;
|
|
|
|
|
|
|
+ let val = +row.nowConfirmedPrepayAmt || 0;
|
|
|
const max = this.getMaxConfirmAmount(row);
|
|
const max = this.getMaxConfirmAmount(row);
|
|
|
if (val > max) {
|
|
if (val > max) {
|
|
|
val = max;
|
|
val = max;
|
|
|
- this.$set(row, 'statementAdvanceConfirmAmount', val);
|
|
|
|
|
|
|
+ this.$set(row, 'nowConfirmedPrepayAmt', val);
|
|
|
this.$message.warning(
|
|
this.$message.warning(
|
|
|
'本次对账预付款确收金额不能超过未对账金额和本次对账金额'
|
|
'本次对账预付款确收金额不能超过未对账金额和本次对账金额'
|
|
|
);
|
|
);
|
|
@@ -389,10 +389,10 @@
|
|
|
// 累计应付金额 = 本次对账金额 - 累计预付确付金额 + 上期累计应付金额
|
|
// 累计应付金额 = 本次对账金额 - 累计预付确付金额 + 上期累计应付金额
|
|
|
recalcRow(row) {
|
|
recalcRow(row) {
|
|
|
const statementAmount = +row.statementAmount || 0;
|
|
const statementAmount = +row.statementAmount || 0;
|
|
|
- let val = +row.statementAdvanceConfirmAmount || 0;
|
|
|
|
|
|
|
+ let val = +row.nowConfirmedPrepayAmt || 0;
|
|
|
const max = this.getMaxConfirmAmount(row);
|
|
const max = this.getMaxConfirmAmount(row);
|
|
|
if (val > max) val = max;
|
|
if (val > max) val = max;
|
|
|
- this.$set(row, 'statementAdvanceConfirmAmount', val);
|
|
|
|
|
|
|
+ this.$set(row, 'nowConfirmedPrepayAmt', val);
|
|
|
// 本次应付金额 = 本次对账金额 - 确收金额
|
|
// 本次应付金额 = 本次对账金额 - 确收金额
|
|
|
this.$set(
|
|
this.$set(
|
|
|
row,
|
|
row,
|