|
@@ -131,7 +131,7 @@
|
|
|
<el-tag
|
|
<el-tag
|
|
|
v-if="row.newUser"
|
|
v-if="row.newUser"
|
|
|
class="new-user-tag"
|
|
class="new-user-tag"
|
|
|
- type="success"
|
|
|
|
|
|
|
+ type="danger"
|
|
|
size="small"
|
|
size="small"
|
|
|
effect="light">
|
|
effect="light">
|
|
|
新用户
|
|
新用户
|
|
@@ -248,7 +248,7 @@ const state = reactive({
|
|
|
{label: '消费站点', prop: 'stationId', width: 140, query: true, type: 'select', resizable: true, conf: {url: 'washStation/list', valueKey: 'stationId', labelKey: 'stationName'}},
|
|
{label: '消费站点', prop: 'stationId', width: 140, query: true, type: 'select', resizable: true, conf: {url: 'washStation/list', valueKey: 'stationId', labelKey: 'stationName'}},
|
|
|
{label: '归属站点', prop: 'userStationId', width: 140, query: true, type: 'select', resizable: true, conf: {url: 'washStation/list', valueKey: 'stationId', labelKey: 'stationName'}},
|
|
{label: '归属站点', prop: 'userStationId', width: 140, query: true, type: 'select', resizable: true, conf: {url: 'washStation/list', valueKey: 'stationId', labelKey: 'stationName'}},
|
|
|
{width: 220, label: '订单号', prop: 'orderId', query: true, type: 'text', resizable: true, fixed: 'left'},
|
|
{width: 220, label: '订单号', prop: 'orderId', query: true, type: 'text', resizable: true, fixed: 'left'},
|
|
|
- {width: 150, label: '用户手机号', prop: 'mobilePhone', query: true, type: 'text', fixed: 'left'},
|
|
|
|
|
|
|
+ {width: 180, label: '用户手机号', prop: 'mobilePhone', query: true, type: 'text', fixed: 'left'},
|
|
|
{width: 100, label: '设备编号', prop: 'shortId', query: false, type: 'text', resizable: true},
|
|
{width: 100, label: '设备编号', prop: 'shortId', query: false, type: 'text', resizable: true},
|
|
|
{width: 160, label: '开始时间', prop: 'startTime', query: false, sortable: 'custom', type: 'datetime', resizable: true, conf: {format: (val: any) => u.fmt.fmtDate(val)}},
|
|
{width: 160, label: '开始时间', prop: 'startTime', query: false, sortable: 'custom', type: 'datetime', resizable: true, conf: {format: (val: any) => u.fmt.fmtDate(val)}},
|
|
|
{width: 160, label: '结束时间', prop: 'endTime', query: false, sortable: 'custom', type: 'datetime', resizable: true, conf: {format: (val: any) => u.fmt.fmtDateTime(val)}},
|
|
{width: 160, label: '结束时间', prop: 'endTime', query: false, sortable: 'custom', type: 'datetime', resizable: true, conf: {format: (val: any) => u.fmt.fmtDateTime(val)}},
|