|
|
@@ -186,11 +186,7 @@
|
|
|
:data="tableList"
|
|
|
:header-cell-style="{ background: '#EDEEF0', color: '#444' }"
|
|
|
>
|
|
|
- <el-table-column
|
|
|
- align="center"
|
|
|
- prop="transNo"
|
|
|
- label="所属分部"
|
|
|
- >
|
|
|
+ <el-table-column align="center" prop="transNo" label="所属分部">
|
|
|
<template slot-scope="scope">
|
|
|
<div>
|
|
|
<copy-text>{{ scope.row.organName }}</copy-text>
|
|
|
@@ -236,6 +232,20 @@
|
|
|
scope.row.type | orderType
|
|
|
}}</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column align="center" prop="expectAmount" label="订单金额">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div>
|
|
|
+ {{ (scope.row.couponRemitFee+scope.row.expectAmount) | moneyFormat }}
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column align="center" prop="expectAmount" label="优惠金额">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div>
|
|
|
+ {{ scope.row.couponRemitFee | moneyFormat }}
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column align="center" prop="expectAmount" label="应付金额">
|
|
|
<template slot-scope="scope">
|
|
|
<div>
|
|
|
@@ -243,6 +253,7 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+
|
|
|
<el-table-column
|
|
|
align="center"
|
|
|
prop="balancePaymentAmount"
|
|
|
@@ -263,7 +274,9 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column align="center" label="学员姓名">
|
|
|
<template slot-scope="scope">
|
|
|
- <copy-text v-if="scope.row.user.username"> {{ scope.row.user.username }}</copy-text>
|
|
|
+ <copy-text v-if="scope.row.user.username">
|
|
|
+ {{ scope.row.user.username }}</copy-text
|
|
|
+ >
|
|
|
<span v-if="scope.row.user.username && scope.row.user.phone"
|
|
|
>/</span
|
|
|
>
|
|
|
@@ -292,8 +305,8 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column align="center" label="备注" width="220px">
|
|
|
<template slot-scope="scope">
|
|
|
- <overflow-text width="200px" :text="scope.row.memo"/>
|
|
|
- </template>
|
|
|
+ <overflow-text width="200px" :text="scope.row.memo" />
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
<el-table-column align="center" width="150px" label="操作">
|
|
|
<template slot-scope="scope">
|
|
|
@@ -371,17 +384,17 @@ export default {
|
|
|
totalRevenueAmount: 0,
|
|
|
};
|
|
|
},
|
|
|
- created(){
|
|
|
+ created() {
|
|
|
if (this.searchForm.orderDate?.length < 1) {
|
|
|
- this.getNow()
|
|
|
+ this.getNow();
|
|
|
}
|
|
|
},
|
|
|
mounted() {
|
|
|
this.$store.dispatch("setBranchs");
|
|
|
- if(this.$route.params?.orderNo){
|
|
|
+ if (this.$route.params?.orderNo) {
|
|
|
this.searchForm.orderDate = [];
|
|
|
this.searchForm.orderNo = this.$route.params.orderNo;
|
|
|
- this.searchForm.paymentStatus = null
|
|
|
+ this.searchForm.paymentStatus = null;
|
|
|
}
|
|
|
this.getList();
|
|
|
},
|
|
|
@@ -456,7 +469,7 @@ export default {
|
|
|
axios(options)
|
|
|
.then((res) => {
|
|
|
load.endLoading();
|
|
|
- if(res.data.code == 200) {
|
|
|
+ if (res.data.code == 200) {
|
|
|
this.$message.info(res.data.data);
|
|
|
} else {
|
|
|
this.$message.error(res.data.msg);
|
|
|
@@ -483,8 +496,7 @@ export default {
|
|
|
this.getList();
|
|
|
},
|
|
|
getList() {
|
|
|
-
|
|
|
- let { orderDate, ...rest } = this.searchForm;
|
|
|
+ let { orderDate, ...rest } = this.searchForm;
|
|
|
let params = {
|
|
|
...rest,
|
|
|
page: this.pageInfo.page,
|
|
|
@@ -547,7 +559,7 @@ export default {
|
|
|
search: null,
|
|
|
orderStartDate: null,
|
|
|
orderEndDate: null,
|
|
|
- paymentStatus: 'SUCCESS',
|
|
|
+ paymentStatus: "SUCCESS",
|
|
|
paymentType: null,
|
|
|
organId: null,
|
|
|
actualAmount: null,
|
|
|
@@ -557,10 +569,10 @@ export default {
|
|
|
merNos: null,
|
|
|
lessBalancePaymentAmount: null,
|
|
|
lessActualAmount: null,
|
|
|
- orderDate:[]
|
|
|
+ orderDate: [],
|
|
|
};
|
|
|
// this.pageInfo.page = 1;
|
|
|
- this.getNow()
|
|
|
+ this.getNow();
|
|
|
this.getList();
|
|
|
},
|
|
|
},
|
mo