Merge remote-tracking branch 'base/feature_0521' into feature_05210

feature_0521
cuijie 5 years ago
commit 05e96e97a9

@ -73,12 +73,12 @@
class="search-select"
v-model="searchShop" />
<span class="search-span">选择日期</span>
<DatePicker v-model="date"
class="left-15 date-picker"
type="date"
placement="bottom-start"
<DatePicker :value="selectDate"
type="daterange"
split-panels
placeholder="请选择日期"></DatePicker>
placeholder="请选择日期"
@on-change="onChangeDateLister"
class="date-picker"></DatePicker>
<span class="search-span">零售公司</span>
<Select v-model="companyId"
filterable
@ -120,12 +120,12 @@
class="search-select"
v-model="searchShop" />
<span class="search-span">选择日期</span>
<DatePicker v-model="date"
class="left-15 date-picker"
type="date"
placement="bottom-start"
<DatePicker :value="selectDate"
type="daterange"
split-panels
placeholder="请选择日期"></DatePicker>
placeholder="请选择日期"
@on-change="onChangeDateLister"
class="date-picker"></DatePicker>
<span class="search-span">零售公司</span>
<Select v-model="companyId"
filterable
@ -312,7 +312,7 @@ export default {
}
},
{
title: "加入时间",
title: "提交时间",
width: 120,
render: (h, params) => {
return h("span", formatDate(params.row.joinTime));
@ -387,14 +387,14 @@ export default {
}
},
{
title: "导购",
title: "发展人",
width: 80,
render: (h, params) => {
return h("span", params.row.fissionUser.name);
}
},
{
title: "加入时间",
title: "提交时间",
width: 120,
render: (h, params) => {
return h("span", formatDate(params.row.joinTime));
@ -472,14 +472,14 @@ export default {
}
},
{
title: "导购",
title: "发展人",
width: 80,
render: (h, params) => {
return h("span", params.row.fissionUser.name);
}
},
{
title: "加入时间",
title: "提交时间",
width: 120,
render: (h, params) => {
return h("span", formatDate(params.row.joinTime));

@ -43,8 +43,7 @@
:columns="columns1"
:data="data1"
class="table-store"
size="small"
@on-row-dblclick="onDblClickRowLister">
size="small">
<template slot="action"
slot-scope="{row}">
<i-col span="12">
@ -244,18 +243,24 @@ export default {
width: 250,
render: (h, params) => {
let that = this;
let color = "#3496EB"
if (parseInt(params.row.level) >= 3) {
color = "#999"
}
return h('div', [
h('span', {
style: {
background: 'white',
border: '0',
color: '#3496EB',
color: color,
marginRight: '15px',
cursor: 'pointer'
},
on: {
click: () => {
that.show(params.row)
if (parseInt(params.row.level) < 3) {
that.show(params.row)
}
}
}
}, '升级'),
@ -388,6 +393,12 @@ export default {
start: that.selectDate[0] === "" || that.selectDate.length == 0 ? null : that.selectDate[0],
end: that.selectDate[1] === "" || that.selectDate.length == 0 ? null : that.selectDate[1],
};
if (request.storeId <= 0) {
request.storeId = undefined
}
if (request.companyId <= 0) {
request.companyId = undefined
}
bulletinService.promoterList(request, function (data) {
that.loading = false;
if (data.data.code == "0000") {

Loading…
Cancel
Save