|
@@ -73,7 +73,7 @@
|
|
|
</a-row>
|
|
|
</a-form>
|
|
|
<div class="table-operator">
|
|
|
- <a-button type="primary" class="button-error" id="redPacket-handleEdit">批量标记已发</a-button>
|
|
|
+ <a-button type="primary" class="button-error">批量标记已发</a-button>
|
|
|
<span>已选2项</span>
|
|
|
</div>
|
|
|
<a-alert type="info" style="margin-bottom:10px">
|
|
@@ -95,15 +95,20 @@
|
|
|
:row-selection="{ columnWidth: 40 }"
|
|
|
@rowSelection="rowSelectionFun"
|
|
|
:data="loadData"
|
|
|
- :scroll="{ y: tableHeight, x: 2360 }"
|
|
|
+ :scroll="{ y: tableHeight, x: 1900 }"
|
|
|
:defaultLoadData="false"
|
|
|
bordered>
|
|
|
+ <template slot="orderNo" slot-scope="text, record">
|
|
|
+ <a @click="viewDetail(record)">{{ record.id }}</a>
|
|
|
+ </template>
|
|
|
<template slot="action" slot-scope="text, record">
|
|
|
<a-button size="small" type="link" class="button-info" @click="handlePublish(record)">标记已发</a-button>
|
|
|
<a-button size="small" type="link" class="button-error" @click="handleDelete(record)">删除</a-button>
|
|
|
</template>
|
|
|
</s-table>
|
|
|
</a-spin>
|
|
|
+ <!-- 详情弹框 -->
|
|
|
+ <statisticsDetail :visible="openModal" :itemData="itemData" @close="openModal=false"></statisticsDetail>
|
|
|
</a-card>
|
|
|
</template>
|
|
|
|
|
@@ -113,13 +118,15 @@ import { getShelfList } from '@/api/shelf.js'
|
|
|
import dealerList from '@/views/common/dealerList.vue'
|
|
|
import storeList from '@/views/common/storeList.vue'
|
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
+import statisticsDetail from './statisticsDetail.vue'
|
|
|
export default {
|
|
|
name: 'UserList',
|
|
|
- components: { STable, VSelect, storeList, dealerList, rangeDate },
|
|
|
+ components: { STable, VSelect, storeList, dealerList, rangeDate, statisticsDetail },
|
|
|
data () {
|
|
|
return {
|
|
|
spinning: false,
|
|
|
advanced: false,
|
|
|
+ openModal: false,
|
|
|
tableHeight: 0,
|
|
|
// 查询参数
|
|
|
queryParam: {
|
|
@@ -130,30 +137,21 @@ export default {
|
|
|
// 表头
|
|
|
columns: [
|
|
|
{ title: '序号', dataIndex: 'no', width: '60px', align: 'center' },
|
|
|
- { title: '活动名称', dataIndex: 'shelfName', width: '120px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '货架名称', dataIndex: 'dealerName', width: '120px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '配件经销商', dataIndex: 'dealerName', width: '120px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '汽车修理厂', dataIndex: 'storeName', width: '120px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '活动名称', dataIndex: 'shelfName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '货架名称', dataIndex: 'dealerName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '配件经销商', dataIndex: 'dealerName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '汽车修理厂', dataIndex: 'storeName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '员工姓名', dataIndex: 'createDate', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '员工手机号码', dataIndex: 'dealerName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '订单编号', dataIndex: 'storeName', width: '100px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '订单编号', dataIndex: 'orderNo', scopedSlots: { customRender: 'orderNo' }, width: '130px', align: 'center' },
|
|
|
{ title: '订单类型', dataIndex: 'shelfPlaceNum', width: '80px', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
|
|
|
{ title: '订单状态', dataIndex: 'shelfPlaceNum', width: '80px', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
|
|
|
- { title: '下单时间', dataIndex: 'createDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '下单时间', dataIndex: 'createDate', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: 'VIN', dataIndex: 'settleTypeDictValue', width: '140px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '车型', dataIndex: 'storeName', width: '120px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '产品编码', dataIndex: 'storeName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '产品名称', dataIndex: 'storeName', width: '120px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '下单数量', dataIndex: 'shelfPlaceNum', width: '80px', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
|
|
|
- { title: '售价', dataIndex: 'shelfPlaceNum', width: '80px', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
|
|
|
- { title: '售价小计', dataIndex: 'shelfPlaceNum', width: '80px', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
|
|
|
- { title: '成本小计', dataIndex: 'shelfPlaceNum', width: '80px', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
|
|
|
- { title: '毛利小计', dataIndex: 'shelfPlaceNum', width: '80px', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
|
|
|
- { title: '红包奖励时间', dataIndex: 'createDate', width: '90px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '红包毛利比例', dataIndex: 'shelfPlaceNum', width: '90px', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
|
|
|
- { title: '红包金额', dataIndex: 'shelfPlaceNum', width: '80px', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
|
|
|
+ { title: '本单红包金额小计', dataIndex: 'shelfPlaceNum', width: '80px', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
|
|
|
{ title: '红包发放状态', dataIndex: 'shelfPlaceNum', width: '100px', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
|
|
|
- { title: '红包发放时间', dataIndex: 'createDate', width: '100px', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
|
|
|
+ { title: '红包发放时间', dataIndex: 'createDate', width: '150px', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
|
|
|
{ title: '操作', width: '120px', align: 'left', scopedSlots: { customRender: 'action' }, fixed: 'right' }
|
|
|
],
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
@@ -207,17 +205,14 @@ export default {
|
|
|
}
|
|
|
this.$refs.table.refresh(true)
|
|
|
},
|
|
|
- // 编辑/新增
|
|
|
- handleEdit (row) {
|
|
|
- if (row) { // 编辑
|
|
|
- this.$router.push({ name: 'redPacketEdit', params: { shelfSn: row.sn } })
|
|
|
- } else {
|
|
|
- this.$router.push({ name: 'redPacketAdd' })
|
|
|
- }
|
|
|
- },
|
|
|
- // 发布
|
|
|
+ // 标记发布
|
|
|
handlePublish (row) {
|
|
|
},
|
|
|
+ // 详情
|
|
|
+ viewDetail (row) {
|
|
|
+ this.itemData = row
|
|
|
+ this.openModal = true
|
|
|
+ },
|
|
|
// 删除
|
|
|
handleDelete (row) {
|
|
|
const _this = this
|