Commit 2dd1d51c by 吕明尚

订单管理页面修改订单优惠卷id字段

parent bad0b4dd
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
<dict-tag :options="dict.type.store_platform_type" :value="scope.row.platformType"/> <dict-tag :options="dict.type.store_platform_type" :value="scope.row.platformType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="columns[10].visible" align="center" label="优惠券id" prop="couponSkuId" width="100"/> <el-table-column v-if="columns[10].visible" align="center" label="优惠券id" prop="couponId" width="100"/>
<el-table-column v-if="columns[11].visible" label="优惠券名称" align="center" prop="couponName" width="100"/> <el-table-column v-if="columns[11].visible" label="优惠券名称" align="center" prop="couponName" width="100"/>
<el-table-column v-if="columns[12].visible" align="center" label="优惠券原价" prop="couponPrice" width="100"/> <el-table-column v-if="columns[12].visible" align="center" label="优惠券原价" prop="couponPrice" width="100"/>
<el-table-column v-if="columns[13].visible" align="center" label="优惠券促销价" prop="couponPayPrice" width="100"/> <el-table-column v-if="columns[13].visible" align="center" label="优惠券促销价" prop="couponPayPrice" width="100"/>
......
...@@ -14,32 +14,32 @@ ...@@ -14,32 +14,32 @@
<!-- <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 align="center" label="订单编号" prop="orderNo" width="150"/> <el-table-column align="center" label="订单编号" prop="orderNo" width="250"/>
<el-table-column align="center" label="门店名称" prop="storeName" width="120"/> <el-table-column align="center" label="门店名称" prop="storeName"/>
<el-table-column align="center" label="房间名称" prop="roomName" width="120"/> <el-table-column align="center" label="房间名称" prop="roomName"/>
<el-table-column align="center" label="手机号" prop="consumerPhone" width="110"/> <el-table-column align="center" label="手机号" prop="consumerPhone"/>
<el-table-column align="center" label="会员昵称" prop="consumerName" width="100"/> <el-table-column align="center" label="会员昵称" prop="consumerName"/>
<el-table-column align="center" label="预约开始时间" prop="preStartDate" width="100"> <el-table-column align="center" label="预约开始时间" prop="preStartDate">
<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>
</el-table-column> </el-table-column>
<el-table-column label="预约结束时间" align="center" prop="preEndDate" width="100"> <el-table-column align="center" label="预约结束时间" prop="preEndDate">
<template slot-scope="scope"> <template slot-scope="scope">
<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="startDate" width="100"> <el-table-column align="center" label="开始时间" prop="startDate">
<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>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="结束时间" align="center" prop="endDate" width="100"> <el-table-column align="center" label="结束时间" prop="endDate">
<template slot-scope="scope"> <template slot-scope="scope">
<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 align="center" label="订单状态" prop="status" width="100"> <el-table-column align="center" label="订单状态" 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>
......
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