|
@@ -433,10 +433,15 @@
|
|
|
<el-tooltip content="按实收金额排序" placement="top"/>
|
|
<el-tooltip content="按实收金额排序" placement="top"/>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
- <el-table-column label="物流代收金额" align="center" prop="payDelivery" >
|
|
|
|
|
|
|
+ <!-- <el-table-column label="物流代收金额" align="center" prop="payDelivery" >
|
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
|
<span v-if="scope.row.payPrice!=null">{{scope.row.payDelivery.toFixed(2)}}</span>
|
|
<span v-if="scope.row.payPrice!=null">{{scope.row.payDelivery.toFixed(2)}}</span>
|
|
|
</template>
|
|
</template>
|
|
|
|
|
+ </el-table-column> -->
|
|
|
|
|
+ <el-table-column label="物流代收金额" align="center" prop="payDelivery" >
|
|
|
|
|
+ <template slot-scope="scope">
|
|
|
|
|
+ <span>{{ getLogisticsCollectionAmount(scope.row) }}</span>
|
|
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<el-table-column label="下单时间" align="center" prop="createTime" />
|
|
<el-table-column label="下单时间" align="center" prop="createTime" />
|
|
|
<!-- <el-table-column label="支付状态" align="center" prop="paid" /> -->
|
|
<!-- <el-table-column label="支付状态" align="center" prop="paid" /> -->
|
|
@@ -1246,7 +1251,7 @@ export default {
|
|
|
this.getDicts("user_status").then((response) => {
|
|
this.getDicts("user_status").then((response) => {
|
|
|
this.userStatusOptions = response.data;
|
|
this.userStatusOptions = response.data;
|
|
|
});
|
|
});
|
|
|
- this.getDicts("store_pay_type").then((response) => {
|
|
|
|
|
|
|
+ this.getDicts("sys_store_pay_type").then((response) => {
|
|
|
this.payTypeOptions = response.data;
|
|
this.payTypeOptions = response.data;
|
|
|
});
|
|
});
|
|
|
this.getDicts("store_order_status").then((response) => {
|
|
this.getDicts("store_order_status").then((response) => {
|
|
@@ -1267,6 +1272,12 @@ export default {
|
|
|
this.getAppMallOptions();
|
|
this.getAppMallOptions();
|
|
|
},
|
|
},
|
|
|
methods: {
|
|
methods: {
|
|
|
|
|
+ // 计算物流代收金额
|
|
|
|
|
+ getLogisticsCollectionAmount(row) {
|
|
|
|
|
+ const payPrice = parseFloat(row.payPrice) || 0;
|
|
|
|
|
+ const payMoney = parseFloat(row.payMoney) || 0;
|
|
|
|
|
+ return (payPrice - payMoney).toFixed(2);
|
|
|
|
|
+ },
|
|
|
// 新增排序处理方法
|
|
// 新增排序处理方法
|
|
|
handleSortChange({ column, prop, order }) {
|
|
handleSortChange({ column, prop, order }) {
|
|
|
console.log('排序变化:', { column, prop, order });
|
|
console.log('排序变化:', { column, prop, order });
|