Commit 840af2da by 吕明尚

优惠卷管理新增优惠卷售卖金额

parent bb2534bf
...@@ -117,6 +117,8 @@ ...@@ -117,6 +117,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="优惠券原始金额" align="center" prop="subPrice"/> <el-table-column label="优惠券原始金额" align="center" prop="subPrice"/>
<el-table-column align="center" label="优惠券售卖金额" prop="couponPayPrice"/>
<!-- <el-table-column label="时长" align="center" prop="duration" />--> <!-- <el-table-column label="时长" align="center" prop="duration" />-->
<el-table-column label="平台类型" align="center" prop="platformType"> <el-table-column label="平台类型" align="center" prop="platformType">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -601,13 +603,14 @@ export default { ...@@ -601,13 +603,14 @@ export default {
openShopDeal() { openShopDeal() {
this.$refs.select.show(); this.$refs.select.show();
}, },
queryShopDeal(name, startDate, endDate, subPrice, dealgroupId, storeIds) { queryShopDeal(name, startDate, endDate, subPrice, dealgroupId, storeIds, couponPayPrice) {
this.form.name = name; this.form.name = name;
this.form.startDate = startDate; this.form.startDate = startDate;
this.form.endDate = endDate; this.form.endDate = endDate;
this.form.subPrice = subPrice; this.form.subPrice = subPrice;
this.form.dealgroupId = dealgroupId; this.form.dealgroupId = dealgroupId;
this.form.storeIds = storeIds; this.form.storeIds = storeIds;
this.form.couponPayPrice = couponPayPrice;
} }
} }
}; };
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="套餐价格" align="center" prop="subPrice"/> <el-table-column label="套餐价格" align="center" prop="subPrice"/>
<el-table-column align="center" label="售卖价格" prop="couponPayPrice"/>
<el-table-column label="团购ID" align="center" prop="dealgroupId"/> <el-table-column label="团购ID" align="center" prop="dealgroupId"/>
<el-table-column label="适用门店id" align="center" prop="storeIds" width="350"> <el-table-column label="适用门店id" align="center" prop="storeIds" width="350">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -64,7 +65,7 @@ export default { ...@@ -64,7 +65,7 @@ export default {
this.visible = true; this.visible = true;
}, },
clickRow(row) { clickRow(row) {
this.$emit('select', row.name, row.startDate, row.endDate, row.subPrice, row.dealgroupId, row.storeIds); this.$emit('select', row.name, row.startDate, row.endDate, row.subPrice, row.dealgroupId, row.storeIds, row.couponPayPrice);
this.visible = false; this.visible = false;
}, },
// 查询表数据 // 查询表数据
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="套餐价格" align="center" prop="subPrice"/> <el-table-column label="套餐价格" align="center" prop="subPrice"/>
<el-table-column align="center" label="售卖价格" prop="couponPayPrice"/>
<el-table-column label="团购ID" align="center" prop="tiktokSkuId"/> <el-table-column label="团购ID" align="center" prop="tiktokSkuId"/>
<el-table-column label="适用门店id" align="center" prop="storeIds" width="350"> <el-table-column label="适用门店id" align="center" prop="storeIds" width="350">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -55,7 +56,7 @@ export default { ...@@ -55,7 +56,7 @@ export default {
this.tiktokvisible = true; this.tiktokvisible = true;
}, },
clickRow(row) { clickRow(row) {
this.$emit('selectSku', row.tiktokSkuId, row.name, row.subPrice, row.startDate, row.endDate, row.storeIds); this.$emit('selectSku', row.tiktokSkuId, row.name, row.subPrice, row.startDate, row.endDate, row.storeIds, row.couponPayPrice);
this.dataList = []; this.dataList = [];
this.tiktokvisible = false; this.tiktokvisible = false;
}, },
......
...@@ -117,6 +117,7 @@ ...@@ -117,6 +117,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="优惠券原始金额" align="center" prop="subPrice"/> <el-table-column label="优惠券原始金额" align="center" prop="subPrice"/>
<el-table-column align="center" label="优惠券售卖金额" prop="couponPayPrice"/>
<!-- <el-table-column label="时长" align="center" prop="duration" />--> <!-- <el-table-column label="时长" align="center" prop="duration" />-->
<el-table-column label="平台类型" align="center" prop="platformType"> <el-table-column label="平台类型" align="center" prop="platformType">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -602,13 +603,14 @@ export default { ...@@ -602,13 +603,14 @@ export default {
openSku() { openSku() {
this.$refs.selectSkuList.show(); this.$refs.selectSkuList.show();
}, },
querySku(tiktokSkuId, name, subPrice, startDate, endDate, storeIds) { querySku(tiktokSkuId, name, subPrice, startDate, endDate, storeIds, couponPayPrice) {
this.form.tiktokSkuId = tiktokSkuId; this.form.tiktokSkuId = tiktokSkuId;
this.form.startDate = startDate; this.form.startDate = startDate;
this.form.endDate = endDate; this.form.endDate = endDate;
this.form.subPrice = subPrice; this.form.subPrice = subPrice;
this.form.storeIds = storeIds; this.form.storeIds = storeIds;
this.form.name = name; this.form.name = name;
this.form.couponPayPrice = couponPayPrice;
} }
} }
}; };
......
...@@ -197,11 +197,9 @@ ...@@ -197,11 +197,9 @@
<div style="display: flex;flex-direction: row;"> <div style="display: flex;flex-direction: row;">
<el-button type="primary" size="mini" disabled><span>订单总数: {{ total }}</span></el-button> <el-button type="primary" size="mini" disabled><span>订单总数: {{ total }}</span></el-button>
<el-button type="primary" size="mini" disabled><span>订单总价: {{ totalPrice }}</span></el-button> <el-button type="primary" size="mini" disabled><span>订单总价: {{ totalPrice }}</span></el-button>
<el-button type="primary" size="mini" disabled><span>实际总支付金额: {{ payPrice }}</span></el-button> <el-button disabled size="mini" type="primary"><span>优惠卷售卖总金额: {{ couponAmount }}</span></el-button>
<el-button type="primary" size="mini" disabled><span>已使用总金额: {{ usedAmount }}</span></el-button> <el-button disabled size="mini" type="primary"><span>申请退款总金额: {{ refundAmount }}</span></el-button>
<el-button type="primary" size="mini" disabled><span>已使用实付金额: {{ usedPayAmount }}</span></el-button> <el-button disabled size="mini" type="primary"><span>实际退款总金额: {{ realRefundAmount }}</span></el-button>
<el-button type="primary" size="mini" disabled><span>以退款总金额: {{ refundAmount }}</span></el-button>
<el-button type="primary" size="mini" disabled><span>以退款实付金额: {{ refundPayAmount }}</span></el-button>
</div> </div>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
...@@ -648,6 +646,8 @@ export default { ...@@ -648,6 +646,8 @@ export default {
usedAmount: 0, usedAmount: 0,
usedPayAmount: 0, usedPayAmount: 0,
refundAmount: 0, refundAmount: 0,
couponAmount: 0,
realRefundAmount: 0,
refundPayAmount: 0, refundPayAmount: 0,
// 订单表格数据 // 订单表格数据
orderList: [], orderList: [],
...@@ -793,10 +793,10 @@ export default { ...@@ -793,10 +793,10 @@ export default {
this.totalPrice = response.totalAmount.toFixed(2); this.totalPrice = response.totalAmount.toFixed(2);
//计算实际支付金额,取3位小数 //计算实际支付金额,取3位小数
this.payPrice = response.amount.toFixed(2); this.payPrice = response.amount.toFixed(2);
this.usedAmount = response.usedAmount.toFixed(2); this.couponAmount = response.couponAmount.toFixed(2);
this.usedPayAmount = response.usedPayAmount.toFixed(2);
this.refundAmount = response.refundAmount.toFixed(2); this.refundAmount = response.refundAmount.toFixed(2);
this.refundPayAmount = response.refundPayAmount.toFixed(2); this.realRefundAmount = response.realRefundAmount.toFixed(2);
this.loading = false; this.loading = false;
}); });
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment