|
|
@@ -22,31 +22,24 @@
|
|
|
>{{ scope.row.orderSn }}</el-link>
|
|
|
</template>
|
|
|
|
|
|
- <!-- 订花人 -->
|
|
|
- <template #table-column-bookName="{scope}">
|
|
|
- <div class="book-wrap">
|
|
|
- <div style="width:58px;overflow: hidden;text-overflow:ellipsis;white-space:nowrap;">{{ scope.row.bookName }}</div>
|
|
|
+ <template #table-column-customName="{scope}">
|
|
|
+ <div>
|
|
|
+ {{ scope.row.customName }}
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
- <!-- 订花人手机号 -->
|
|
|
- <template #table-column-bookMobile="{scope}">
|
|
|
- <div v-if="scope.row.bookMobile == ''">-</div>
|
|
|
- <div v-else>{{ scope.row.bookMobile }}</div>
|
|
|
+ <template #table-column-customMobile="{scope}">
|
|
|
+ <div v-if="scope.row.customMobile == ''">-</div>
|
|
|
+ <div v-else>{{ scope.row.customMobile }}</div>
|
|
|
</template>
|
|
|
|
|
|
<!-- 状态 -->
|
|
|
<template #table-column-status="{scope}">
|
|
|
- <el-tag v-if="scope.row.status == 2">待配送</el-tag>
|
|
|
- <el-tag v-else-if="scope.row.status == 3">配送中</el-tag>
|
|
|
- <el-tag v-else-if="scope.row.status == 4">已完成</el-tag>
|
|
|
- <el-tag v-else-if="scope.row.status == 5">已取消</el-tag>
|
|
|
- <el-tag v-else>待付款</el-tag>
|
|
|
- </template>
|
|
|
-
|
|
|
- <!-- 进度 -->
|
|
|
- <template #table-column-currentFlow="{scope}">
|
|
|
- <el-progress :percentage="(scope.row.currentFlow/scope.row.totalFlow)*100" :format="formatProgress" ></el-progress>
|
|
|
+ <span v-if="scope.row.status == 2">待配送</span>
|
|
|
+ <span v-else-if="scope.row.status == 3">配送中</span>
|
|
|
+ <span v-else-if="scope.row.status == 4">已完成</span>
|
|
|
+ <span v-else-if="scope.row.status == 5">已取消</span>
|
|
|
+ <span v-else>待付款</span>
|
|
|
</template>
|
|
|
|
|
|
<!-- 送达时间 -->
|
|
|
@@ -198,63 +191,72 @@ export default {
|
|
|
ctx.service(this.$service.order)
|
|
|
.set('table', {
|
|
|
columns: [
|
|
|
- // {
|
|
|
- // type: 'selection',
|
|
|
- // align: 'center',
|
|
|
- // width: '60'
|
|
|
- // },
|
|
|
{
|
|
|
prop: 'orderSn',
|
|
|
label: '单号',
|
|
|
align: 'center',
|
|
|
- width: '260'
|
|
|
+ width: '160'
|
|
|
},
|
|
|
{
|
|
|
- prop: 'bookName',
|
|
|
- label: '订花人',
|
|
|
+ prop: 'prePrice',
|
|
|
+ label: '总价',
|
|
|
align: 'center',
|
|
|
- width: '120'
|
|
|
+ width: '130'
|
|
|
},
|
|
|
{
|
|
|
- prop: 'bookMobile',
|
|
|
+ prop: 'actPrice',
|
|
|
+ label: '实付款',
|
|
|
+ align: 'center',
|
|
|
+ emptyText: '无',
|
|
|
+ width: '130'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ prop: 'customName',
|
|
|
+ label: '客户',
|
|
|
+ align: 'center',
|
|
|
+ width: '150'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ prop: 'customMobile',
|
|
|
label: '手机号',
|
|
|
align: 'center',
|
|
|
- width: '110'
|
|
|
+ width: '150'
|
|
|
},
|
|
|
{
|
|
|
- prop: 'reachTime',
|
|
|
- label: '送达时间',
|
|
|
+ prop: 'bigNum',
|
|
|
+ label: '数量',
|
|
|
align: 'center',
|
|
|
- width: 120
|
|
|
+ width: '150'
|
|
|
},
|
|
|
{
|
|
|
- prop: 'prePrice',
|
|
|
- label: '总价',
|
|
|
- align: 'center'
|
|
|
+ prop: 'sendType',
|
|
|
+ label: '配送方式',
|
|
|
+ align: 'center',
|
|
|
+ width: '150'
|
|
|
},
|
|
|
{
|
|
|
- prop: 'actPrice',
|
|
|
- label: '实付款',
|
|
|
+ prop: 'reachTime',
|
|
|
+ label: '送达时间',
|
|
|
align: 'center',
|
|
|
- emptyText: '无',
|
|
|
- 'min-width': 100
|
|
|
+ width: 120
|
|
|
},
|
|
|
{
|
|
|
prop: 'sendNum',
|
|
|
label: '编号',
|
|
|
align: 'center',
|
|
|
- width: 80
|
|
|
+ width: 110
|
|
|
},
|
|
|
{
|
|
|
- prop: 'currentFlow',
|
|
|
- label: '进度',
|
|
|
+ prop: 'status',
|
|
|
+ label: '状态',
|
|
|
align: 'center',
|
|
|
- width: 180
|
|
|
+ width: 110
|
|
|
},
|
|
|
{
|
|
|
- prop: 'status',
|
|
|
- label: '状态',
|
|
|
- align: 'center'
|
|
|
+ prop: 'shopAdminId',
|
|
|
+ label: '开单',
|
|
|
+ align: 'center',
|
|
|
+ width: 110
|
|
|
}
|
|
|
],
|
|
|
|
|
|
@@ -269,7 +271,6 @@ export default {
|
|
|
// 同 element-ui Table-column Attributes
|
|
|
props: {
|
|
|
width: 150,
|
|
|
- height: 128,
|
|
|
align: 'center',
|
|
|
fixed: 'right',
|
|
|
label: '操作'
|
|
|
@@ -279,7 +280,7 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
.set('search', {
|
|
|
- key: { placeholder: '订单号 / 订花人手机号' }
|
|
|
+ key: { placeholder: '订单号 / 姓名，支持拼音首字母搜索' }
|
|
|
})
|
|
|
.set('layout', [
|
|
|
['slot-tabs'],
|
shish