|
@@ -58,7 +58,7 @@
|
|
|
</el-form-item> -->
|
|
|
<el-form-item>
|
|
|
<el-select
|
|
|
- v-model.trim="searchForm.paymentStatus"
|
|
|
+ v-model.trim="searchForm.status"
|
|
|
clearable
|
|
|
filterable
|
|
|
@clear="onClear('paymentStatus')"
|
|
@@ -93,7 +93,7 @@
|
|
|
<el-table-column align="center" prop="expectAmount" label="应付金额"></el-table-column>
|
|
|
<!-- <el-table-column align="center" prop="balancePaymentAmount" label="余额支付"></el-table-column> -->
|
|
|
<el-table-column align="center" prop="actualAmount" label="实付金额"></el-table-column>
|
|
|
- <el-table-column align="center" label="学员姓名">
|
|
|
+ <el-table-column align="center" label="用户姓名">
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.username }}
|
|
|
</template>
|
|
@@ -143,7 +143,7 @@ export default {
|
|
|
searchForm: {
|
|
|
orderStartDate: null,
|
|
|
orderEndDate: null,
|
|
|
- paymentStatus: "SUCCESS",
|
|
|
+ status: "SUCCESS",
|
|
|
paymentType: null,
|
|
|
organId: null
|
|
|
},
|
|
@@ -199,8 +199,8 @@ export default {
|
|
|
orderType: 0
|
|
|
};
|
|
|
let searchForm = this.searchForm;
|
|
|
- if (searchForm.paymentStatus) {
|
|
|
- data.paymentStatus = searchForm.paymentStatus;
|
|
|
+ if (searchForm.status) {
|
|
|
+ data.status = searchForm.status;
|
|
|
}
|
|
|
|
|
|
if (searchForm.paymentType) {
|