|
@@ -1,6 +1,6 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
- <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
|
|
|
+ <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="80px">
|
|
|
<el-form-item label="客户姓名" prop="customerName">
|
|
|
<el-input
|
|
|
v-model="queryParams.customerName"
|
|
@@ -42,12 +42,12 @@
|
|
|
<el-table :data="manageList">
|
|
|
<af-table-column label="客户姓名" align="center" prop="customerName" />
|
|
|
<af-table-column label="手机号" align="center" prop="phoneNumber" />
|
|
|
- <af-table-column label="油品" align="center" prop="oilName" />
|
|
|
- <af-table-column label="汽油余额" align="center" prop="qyAmt" />
|
|
|
- <af-table-column label="柴油余额" align="center" prop="cyAmt" />
|
|
|
- <af-table-column label="积分" align="center" prop="integral" />
|
|
|
- <af-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
- <template slot-scope="scope">
|
|
|
+ <af-table-column label="购买过的油品" align="center" prop="oilName" />
|
|
|
+ <af-table-column label="汽油卡余额" align="center" prop="qyAmt" />
|
|
|
+ <af-table-column label="柴油卡余额" align="center" prop="cyAmt" />
|
|
|
+ <af-table-column label="剩余积分" align="center" prop="integral" />
|
|
|
+ <af-table-column label="操作" align="center" width="100px">
|
|
|
+ <template slot-scope="scope" >
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
@@ -73,26 +73,24 @@
|
|
|
<af-table-column label="油品名称" align="center" prop="oilName" />
|
|
|
<af-table-column label="油品价格" align="center" prop="oilPirce" />
|
|
|
<af-table-column label="加油升数" align="center" prop="orderLiters" />
|
|
|
- <af-table-column label="金额" align="center" prop="amt" />
|
|
|
- <af-table-column label="消费者" width="120" align="center" prop="consumer" />
|
|
|
+ <af-table-column label="实付金额" align="center" prop="amt" />
|
|
|
+ <af-table-column label="消费者昵称" width="120" align="center" prop="consumer" />
|
|
|
<af-table-column label="加油员" width="120" align="center" prop="oilPersonnel" />
|
|
|
<af-table-column label="加油枪号" align="center" prop="oilGun" />
|
|
|
<af-table-column label="支付类型" align="center" prop="payType" :formatter="payTypeFotmat"/>
|
|
|
<af-table-column label="油站名称" width="120" align="center" prop="stationName" v-if="false"/>
|
|
|
<af-table-column label="用户id(消费者)" align="center" prop="consumerId" v-if="false" />
|
|
|
<af-table-column label="油站id" align="center" prop="stationId" v-if="false" />
|
|
|
- <af-table-column label="状态" align="center" prop="status" :formatter="statusFotmat" width="80px"/>
|
|
|
- <af-table-column label="支付时间" align="center" prop="payDate" width="160px">
|
|
|
+ <af-table-column label="支付完成时间" align="center" prop="payDate" width="160px">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ parseTime(scope.row.payDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
|
|
</template>
|
|
|
</af-table-column>
|
|
|
- <af-table-column label="创建时间" align="center" prop="createdDate" width="160px">
|
|
|
+ <af-table-column label="订单创建时间" align="center" prop="createdDate" width="160px">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ parseTime(scope.row.createdDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
|
|
</template>
|
|
|
</af-table-column>
|
|
|
- <af-table-column label="订单类型" align="center" prop="orderType" v-if="false" />
|
|
|
</el-table>
|
|
|
<pagination
|
|
|
v-show="totalOrder>0"
|
|
@@ -139,7 +137,7 @@ export default {
|
|
|
oilName: null,
|
|
|
stationId: null,
|
|
|
consumerId: null
|
|
|
- },
|
|
|
+ }
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
@@ -188,13 +186,10 @@ export default {
|
|
|
this.handleQuery();
|
|
|
},
|
|
|
detail(row){
|
|
|
- console.log("row",row);
|
|
|
- row.page= this.queryOrder.pageNum;
|
|
|
- row.limit= this.queryOrder.pageSize;
|
|
|
- this.listPage(row);
|
|
|
- },
|
|
|
- listPage(row){
|
|
|
this.queryOrder.consumerId = row.minaUserId;
|
|
|
+ this.listPage();
|
|
|
+ },
|
|
|
+ listPage(){
|
|
|
getOrderInfo(this.queryOrder).then(response => {
|
|
|
this.orderList = response.rows;
|
|
|
this.openOrderInfo = true;
|