|
@@ -76,10 +76,10 @@
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
|
|
- <template v-slot:paymentCondition="scope">
|
|
|
|
|
|
|
+ <template v-slot:collectionConditionName="scope">
|
|
|
<el-input
|
|
<el-input
|
|
|
clearable
|
|
clearable
|
|
|
- :value="scope.row.paymentConditionName"
|
|
|
|
|
|
|
+ :value="scope.row.collectionConditionName"
|
|
|
@click.native="openReceiveTerms(scope.$index)"
|
|
@click.native="openReceiveTerms(scope.$index)"
|
|
|
:placeholder="isView ? '' : '请选择'"
|
|
:placeholder="isView ? '' : '请选择'"
|
|
|
:disabled="isView"
|
|
:disabled="isView"
|
|
@@ -183,22 +183,25 @@
|
|
|
showOverflowTooltip: true
|
|
showOverflowTooltip: true
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
|
|
+ prop: 'fundType',
|
|
|
minWidth: 140,
|
|
minWidth: 140,
|
|
|
label: '款项类型',
|
|
label: '款项类型',
|
|
|
align: 'center',
|
|
align: 'center',
|
|
|
slot: 'fundType'
|
|
slot: 'fundType'
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
|
|
+ prop: 'transactionMode',
|
|
|
minWidth: 140,
|
|
minWidth: 140,
|
|
|
label: '交易方式',
|
|
label: '交易方式',
|
|
|
align: 'center',
|
|
align: 'center',
|
|
|
slot: 'transactionMode'
|
|
slot: 'transactionMode'
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
|
|
+ prop: 'collectionConditionName',
|
|
|
minWidth: 160,
|
|
minWidth: 160,
|
|
|
label: '收款条件',
|
|
label: '收款条件',
|
|
|
align: 'center',
|
|
align: 'center',
|
|
|
- slot: 'paymentCondition'
|
|
|
|
|
|
|
+ slot: 'collectionConditionName'
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
minWidth: 140,
|
|
minWidth: 140,
|
|
@@ -212,7 +215,7 @@
|
|
|
prop: 'statementAdvanceConfirmAmount',
|
|
prop: 'statementAdvanceConfirmAmount',
|
|
|
label: '本次对账预收款确收金额',
|
|
label: '本次对账预收款确收金额',
|
|
|
align: 'center',
|
|
align: 'center',
|
|
|
- slot: 'statementAdvanceConfirmAmount'
|
|
|
|
|
|
|
+ // slot: 'statementAdvanceConfirmAmount'
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
minWidth: 120,
|
|
minWidth: 120,
|
|
@@ -223,19 +226,19 @@
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
minWidth: 120,
|
|
minWidth: 120,
|
|
|
- prop: 'currentReceivableAmount',
|
|
|
|
|
|
|
+ prop: 'receivedPrice',
|
|
|
label: '本次应收金额',
|
|
label: '本次应收金额',
|
|
|
align: 'center',
|
|
align: 'center',
|
|
|
showOverflowTooltip: true
|
|
showOverflowTooltip: true
|
|
|
},
|
|
},
|
|
|
- {
|
|
|
|
|
- minWidth: 100,
|
|
|
|
|
- prop: 'action',
|
|
|
|
|
- label: '操作',
|
|
|
|
|
- align: 'center',
|
|
|
|
|
- slot: 'action',
|
|
|
|
|
- fixed: 'right'
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // {
|
|
|
|
|
+ // minWidth: 100,
|
|
|
|
|
+ // prop: 'action',
|
|
|
|
|
+ // label: '操作',
|
|
|
|
|
+ // align: 'center',
|
|
|
|
|
+ // slot: 'action',
|
|
|
|
|
+ // fixed: 'right'
|
|
|
|
|
+ // }
|
|
|
]
|
|
]
|
|
|
};
|
|
};
|
|
|
},
|
|
},
|
|
@@ -280,8 +283,8 @@
|
|
|
changeReceiveTerms(row, index) {
|
|
changeReceiveTerms(row, index) {
|
|
|
const targetIndex = index != null ? index : this.currentRowIndex;
|
|
const targetIndex = index != null ? index : this.currentRowIndex;
|
|
|
if (targetIndex == null) return;
|
|
if (targetIndex == null) return;
|
|
|
- this.updateRowField(targetIndex, 'paymentConditionId', row.id);
|
|
|
|
|
- this.updateRowField(targetIndex, 'paymentConditionName', row.name);
|
|
|
|
|
|
|
+ this.updateRowField(targetIndex, 'collectionConditionId', row.id);
|
|
|
|
|
+ this.updateRowField(targetIndex, 'collectionConditionName', row.name);
|
|
|
},
|
|
},
|
|
|
// 行内字段修改:通过 .sync 回写 receivableList
|
|
// 行内字段修改:通过 .sync 回写 receivableList
|
|
|
updateRowField(index, key, val) {
|
|
updateRowField(index, key, val) {
|
|
@@ -314,7 +317,7 @@
|
|
|
}
|
|
}
|
|
|
const currentReceivable =
|
|
const currentReceivable =
|
|
|
Math.round(((+row.statementAmount || 0) - val) * 100) / 100;
|
|
Math.round(((+row.statementAmount || 0) - val) * 100) / 100;
|
|
|
- this.$set(row, 'currentReceivableAmount', currentReceivable);
|
|
|
|
|
|
|
+ this.$set(row, 'receivedPrice', currentReceivable);
|
|
|
this.$emit('update:receivableList', [...this.receivableList]);
|
|
this.$emit('update:receivableList', [...this.receivableList]);
|
|
|
},
|
|
},
|
|
|
recalcAllRows() {
|
|
recalcAllRows() {
|
|
@@ -328,7 +331,7 @@
|
|
|
this.$set(row, 'statementAdvanceConfirmAmount', val);
|
|
this.$set(row, 'statementAdvanceConfirmAmount', val);
|
|
|
this.$set(
|
|
this.$set(
|
|
|
row,
|
|
row,
|
|
|
- 'currentReceivableAmount',
|
|
|
|
|
|
|
+ 'receivedPrice',
|
|
|
Math.round(((+row.statementAmount || 0) - val) * 100) / 100
|
|
Math.round(((+row.statementAmount || 0) - val) * 100) / 100
|
|
|
);
|
|
);
|
|
|
});
|
|
});
|