Commit c921775d by 吕明尚

团购劵配置增加优惠卷原始金额

parent 07f1c9a3
...@@ -9,6 +9,14 @@ export function listOrder(query) { ...@@ -9,6 +9,14 @@ export function listOrder(query) {
}) })
} }
export function queryList(query) {
return request({
url: '/system/order/queryList',
method: 'get',
params: query
})
}
// 查询订单列表 // 查询订单列表
export function queryOrder(query) { export function queryOrder(query) {
return request({ return request({
......
...@@ -14,21 +14,12 @@ ...@@ -14,21 +14,12 @@
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>--> <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
</el-row> </el-row>
<el-table v-loading="loading" :data="orderList"> <el-table v-loading="loading" :data="orderList">
<el-table-column label="订单流水号" align="center" prop="orderNo" width="150"/> <el-table-column align="center" label="订单编号" prop="orderNo" width="150"/>
<el-table-column label="订单类型" align="center" prop="orderType"> <el-table-column align="center" label="门店名称" prop="storeName" width="120"/>
<template slot-scope="scope"> <el-table-column align="center" label="房间名称" prop="roomName" width="120"/>
<dict-tag :options="dict.type.store_order_type" :value="scope.row.orderType"/> <el-table-column align="center" label="手机号" prop="consumerPhone" width="110"/>
</template> <el-table-column align="center" label="会员昵称" prop="consumerName"/>
</el-table-column> <el-table-column align="center" label="预约开始时间" prop="preStartDate" width="100">
<el-table-column label="会员昵称" align="center" prop="consumerName"/>
<el-table-column label="手机号" align="center" prop="consumerPhone" width="110"/>
<el-table-column label="门店名称" align="center" prop="storeName" width="120"/>
<el-table-column label="房间名称" align="center" prop="roomName" width="120"/>
<el-table-column label="套餐名称" align="center" prop="packName" width="120"/>
<el-table-column label="套餐金额" align="center" prop="packPrice" width="100"/>
<el-table-column label="优惠券名称" align="center" prop="couponName" width="100"/>
<el-table-column label="优惠券金额" align="center" prop="couponPrice" width="100"/>
<el-table-column label="预约开始时间" align="center" prop="preStartDate" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.preStartDate, '{y}-{m}-{d} {h}:{i}') }}</span> <span>{{ parseTime(scope.row.preStartDate, '{y}-{m}-{d} {h}:{i}') }}</span>
</template> </template>
...@@ -38,11 +29,6 @@ ...@@ -38,11 +29,6 @@
<span>{{ parseTime(scope.row.preEndDate, '{y}-{m}-{d} {h}:{i}') }}</span> <span>{{ parseTime(scope.row.preEndDate, '{y}-{m}-{d} {h}:{i}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="到店时间" align="center" prop="arrivalTime" width="100">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.arrivalTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="开始时间" align="center" prop="startDate" width="100"> <el-table-column label="开始时间" align="center" prop="startDate" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d} {h}:{i}') }}</span> <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d} {h}:{i}') }}</span>
...@@ -53,35 +39,51 @@ ...@@ -53,35 +39,51 @@
<span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d} {h}:{i}') }}</span> <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d} {h}:{i}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="订单总价" align="center" prop="totalPrice"/>
<el-table-column label="实际支付金额" align="center" prop="payPrice" width="100"/>
<el-table-column label="支付时间" align="center" prop="payTime" width="100">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="订单时长(H)" align="center" prop="timeLong" width="110"/>
<el-table-column label="支付类型" align="center" prop="payType">
<template slot-scope="scope">
<dict-tag :options="dict.type.store_pay_ways" :value="scope.row.payType"/>
</template>
</el-table-column>
<el-table-column label="支付状态" align="center" prop="payStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.order_pay_status" :value="scope.row.payStatus"/>
</template>
</el-table-column>
<el-table-column label="订单状态" align="center" prop="status"> <el-table-column label="订单状态" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.order_status_admin" :value="scope.row.status"/> <dict-tag :options="dict.type.order_status_admin" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="下单时间" align="center" prop="createTime" width="100"> <!-- <el-table-column label="订单类型" align="center" prop="orderType">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <!-- <dict-tag :options="dict.type.store_order_type" :value="scope.row.orderType"/>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="备注" align="center" prop="remark"/> <!-- <el-table-column label="套餐名称" align="center" prop="packName" width="120"/>-->
<!-- <el-table-column label="套餐金额" align="center" prop="packPrice" width="100"/>-->
<!-- <el-table-column label="优惠券名称" align="center" prop="couponName" width="100"/>-->
<!-- <el-table-column label="优惠券金额" align="center" prop="couponPrice" width="100"/>-->
<!-- -->
<!-- <el-table-column label="到店时间" align="center" prop="arrivalTime" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.arrivalTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- -->
<!-- <el-table-column label="订单总价" align="center" prop="totalPrice"/>-->
<!-- <el-table-column label="实际支付金额" align="center" prop="payPrice" width="100"/>-->
<!-- <el-table-column label="支付时间" align="center" prop="payTime" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="订单时长(H)" align="center" prop="timeLong" width="110"/>-->
<!-- <el-table-column label="支付类型" align="center" prop="payType">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.store_pay_ways" :value="scope.row.payType"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="支付状态" align="center" prop="payStatus">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.order_pay_status" :value="scope.row.payStatus"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="下单时间" align="center" prop="createTime" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="备注" align="center" prop="remark"/>-->
</el-table> </el-table>
<pagination <pagination
...@@ -95,7 +97,7 @@ ...@@ -95,7 +97,7 @@
</template> </template>
<script> <script>
import {listOrder, repealOrder} from "@/api/system/order"; import {queryList} from "@/api/system/order";
import {allList} from "@/api/system/store"; import {allList} from "@/api/system/store";
import {queryRoom} from "@/api/system/room"; import {queryRoom} from "@/api/system/room";
import {query} from "@/api/system/pack"; import {query} from "@/api/system/pack";
...@@ -233,7 +235,7 @@ export default { ...@@ -233,7 +235,7 @@ export default {
/** 查询订单列表 */ /** 查询订单列表 */
getList() { getList() {
this.queryParams.status = 10; this.queryParams.status = 10;
listOrder(this.queryParams).then(response => { queryList(this.queryParams).then(response => {
this.orderList = response.rows; this.orderList = response.rows;
this.total = response.total; this.total = response.total;
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