|
|
@@ -85,9 +85,9 @@
|
|
|
/>
|
|
|
</template>
|
|
|
|
|
|
- <!-- <template v-slot:nowConfirmedPrepayAmt="scope">
|
|
|
+ <!-- <template v-slot:confirmedPrepayAmt="scope">
|
|
|
<el-form-item
|
|
|
- :prop="'payablesList.' + scope.$index + '.nowConfirmedPrepayAmt'"
|
|
|
+ :prop="'payablesList.' + scope.$index + '.confirmedPrepayAmt'"
|
|
|
:rules="{
|
|
|
validator: (rule, value, cb) =>
|
|
|
validateConfirmAmount(rule, value, cb, scope.row),
|
|
|
@@ -95,7 +95,7 @@
|
|
|
}"
|
|
|
>
|
|
|
<el-input
|
|
|
- v-model="scope.row.nowConfirmedPrepayAmt"
|
|
|
+ v-model="scope.row.confirmedPrepayAmt"
|
|
|
type="number"
|
|
|
:disabled="true"
|
|
|
@input="handleConfirmAmountChange(scope.row, scope.$index)"
|
|
|
@@ -224,7 +224,7 @@
|
|
|
align: 'center',
|
|
|
},
|
|
|
{
|
|
|
- prop: 'confirmedPrepayAmt',
|
|
|
+ prop: 'nowConfirmedPrepayAmt',
|
|
|
minWidth: 160,
|
|
|
label: '累计预付确付金额',
|
|
|
align: 'center',
|
|
|
@@ -245,10 +245,10 @@
|
|
|
{
|
|
|
minWidth: 190,
|
|
|
headerSlot: 'columnRequired',
|
|
|
- prop: 'nowConfirmedPrepayAmt',
|
|
|
+ prop: 'confirmedPrepayAmt',
|
|
|
label: this.columnsTitle,
|
|
|
align: 'center',
|
|
|
- slot: 'nowConfirmedPrepayAmt'
|
|
|
+ slot: 'confirmedPrepayAmt'
|
|
|
},
|
|
|
{
|
|
|
minWidth: 160,
|
|
|
@@ -295,18 +295,20 @@
|
|
|
// );
|
|
|
},
|
|
|
receivedTotalPrice() {
|
|
|
- return (
|
|
|
- // Math.round(
|
|
|
- // ((+this.dataForm.amountTotalPrice || 0) -
|
|
|
- // this.statementAdvanceTotalPrice) *
|
|
|
- // 100
|
|
|
- // ) / 100
|
|
|
- this.localList.reduce(
|
|
|
- (pre, cur) =>
|
|
|
- pre + Math.round((+cur.payablePrice || 0) * 100),
|
|
|
- 0
|
|
|
- ) / 100
|
|
|
- );
|
|
|
+ return this.dataForm?.statPayable?.payableTotalPrice || 0
|
|
|
+
|
|
|
+ // return (
|
|
|
+ // // Math.round(
|
|
|
+ // // ((+this.dataForm.amountTotalPrice || 0) -
|
|
|
+ // // this.statementAdvanceTotalPrice) *
|
|
|
+ // // 100
|
|
|
+ // // ) / 100
|
|
|
+ // this.localList.reduce(
|
|
|
+ // (pre, cur) =>
|
|
|
+ // pre + Math.round((+cur.payablePrice || 0) * 100),
|
|
|
+ // 0
|
|
|
+ // ) / 100
|
|
|
+ // );
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
|
@@ -355,7 +357,7 @@
|
|
|
paymentConditionId: '',
|
|
|
paymentConditionName: '',
|
|
|
unreconciledAdvanceConfirmAmount: 0,
|
|
|
- nowConfirmedPrepayAmt: 0,
|
|
|
+ confirmedPrepayAmt: 0,
|
|
|
lastPayableAmt: 0,
|
|
|
statementAmount: 0,
|
|
|
payablePrice: 0,
|
|
|
@@ -379,11 +381,11 @@
|
|
|
},
|
|
|
handleConfirmAmountChange(row, index) {
|
|
|
// 限制本次确收金额不能超过未对账金额和本次对账金额
|
|
|
- let val = +row.nowConfirmedPrepayAmt || 0;
|
|
|
+ let val = +row.confirmedPrepayAmt || 0;
|
|
|
const max = this.getMaxConfirmAmount(row);
|
|
|
if (val > max) {
|
|
|
val = max;
|
|
|
- // this.$set(row, 'nowConfirmedPrepayAmt', val);
|
|
|
+ // this.$set(row, 'confirmedPrepayAmt', val);
|
|
|
this.$message.warning(
|
|
|
'本次对账预付款确收金额不能超过未对账金额和本次对账金额'
|
|
|
);
|
|
|
@@ -396,10 +398,10 @@
|
|
|
// 累计应付金额 = 本次对账金额 - 累计预付确付金额 + 上期累计应付金额
|
|
|
recalcRow(row) {
|
|
|
const statementAmount = +row.statementAmount || 0;
|
|
|
- let val = +row.nowConfirmedPrepayAmt || 0;
|
|
|
+ let val = +row.confirmedPrepayAmt || 0;
|
|
|
const max = this.getMaxConfirmAmount(row);
|
|
|
if (val > max) val = max;
|
|
|
- // this.$set(row, 'nowConfirmedPrepayAmt', val);
|
|
|
+ // this.$set(row, 'confirmedPrepayAmt', val);
|
|
|
// 本次应付金额 = 本次对账金额 - 确收金额
|
|
|
this.$set(
|
|
|
row,
|