|
@@ -42,7 +42,7 @@
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column label="订餐人" align="center" prop="orderUserName" show-overflow-tooltip />
|
|
<el-table-column label="订餐人" align="center" prop="orderUserName" show-overflow-tooltip />
|
|
<el-table-column label="订餐人电话" align="center" prop="phone" show-overflow-tooltip />
|
|
<el-table-column label="订餐人电话" align="center" prop="phone" show-overflow-tooltip />
|
|
- <el-table-column label="订餐时间" align="center" prop="orderTime" show-overflow-tooltip >
|
|
|
|
|
|
+ <el-table-column label="订餐时间" align="center" prop="orderTime" show-overflow-tooltip width="160" >
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<span>{{scope.row.orderTime ? scope.row.orderTime : ''}}</span>
|
|
<span>{{scope.row.orderTime ? scope.row.orderTime : ''}}</span>
|
|
</template>
|
|
</template>
|
|
@@ -54,12 +54,12 @@
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column label="价格(元)" align="center" prop="totalMoney" show-overflow-tooltip >
|
|
<el-table-column label="价格(元)" align="center" prop="totalMoney" show-overflow-tooltip >
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <span>{{scope.row.totalMoney ? scope.row.totalMoney : ''}}</span>
|
|
|
|
|
|
+ <span>{{Number(scope.row.totalMoney).toFixed(2) || '0.00'}}</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
|
|
|
<el-table-column label="接单人" align="center" prop="receiveUserName" show-overflow-tooltip />
|
|
<el-table-column label="接单人" align="center" prop="receiveUserName" show-overflow-tooltip />
|
|
- <el-table-column label="接单时间" align="center" prop="receiveTime" show-overflow-tooltip >
|
|
|
|
|
|
+ <el-table-column label="接单时间" align="center" prop="receiveTime" show-overflow-tooltip width="160">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<span>{{scope.row.receiveTime ? scope.row.receiveTime : ''}}</span>
|
|
<span>{{scope.row.receiveTime ? scope.row.receiveTime : ''}}</span>
|
|
</template>
|
|
</template>
|
|
@@ -70,7 +70,7 @@
|
|
<span>{{scope.row.orderStatus == "0" ? "待接单" : scope.row.orderStatus == "1" ? "配餐中" : scope.row.orderStatus == "2" ? "送餐中" : "已完成"}}</span>
|
|
<span>{{scope.row.orderStatus == "0" ? "待接单" : scope.row.orderStatus == "1" ? "配餐中" : scope.row.orderStatus == "2" ? "送餐中" : "已完成"}}</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column label="完成时间" align="center" prop="sendEndTime" show-overflow-tooltip >
|
|
|
|
|
|
+ <el-table-column label="完成时间" align="center" prop="sendEndTime" show-overflow-tooltip width="160">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<span>{{scope.row.sendEndTime ? scope.row.sendEndTime : ''}}</span>
|
|
<span>{{scope.row.sendEndTime ? scope.row.sendEndTime : ''}}</span>
|
|
</template>
|
|
</template>
|
|
@@ -126,7 +126,7 @@
|
|
<el-col :span="12"><div class="grid-content bg-purple">下单时间: {{details.row.orderTime ? details.row.orderTime : ''}}</div></el-col>
|
|
<el-col :span="12"><div class="grid-content bg-purple">下单时间: {{details.row.orderTime ? details.row.orderTime : ''}}</div></el-col>
|
|
</el-row>
|
|
</el-row>
|
|
<el-row type="flex" class="row-bg" justify="space-between">
|
|
<el-row type="flex" class="row-bg" justify="space-between">
|
|
- <el-col :span="12"><div class="grid-content title">菜品清单</div></el-col>
|
|
|
|
|
|
+ <el-col :span="12" style="text-align:left"><div class="grid-content title">菜品清单</div></el-col>
|
|
</el-row>
|
|
</el-row>
|
|
|
|
|
|
<el-table v-loading="loading" :data="details.dishes" height="30vh" stripe style="border:1px solid #dfe6ec;overflow-y:scroll">
|
|
<el-table v-loading="loading" :data="details.dishes" height="30vh" stripe style="border:1px solid #dfe6ec;overflow-y:scroll">
|