Commit 905993f6 by chenyu

Merge branch 'bugfix/1月5生产bug' of http://git.gicdev.com/marketing-web/marketing into dev

parents bb279c34 ebaa218e
......@@ -106,7 +106,7 @@
<div slot="header" class="clearfix">
<el-date-picker :pickerOptions="pickerOptions" v-model="dateTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="consumeRecord('two')" @click.native="minDate = null"></el-date-picker>
<select-depart v-if="config.isMoreAccount && config.showAllDepartment" :data="deparment2" @load="() => load('two')" @getDepartId="id => getDepartId(id, 'two')" @remote-search="val => remoteSearch(val, 'two')" :loading="deparment2.loading" />
<span class="fz12 gray">* 此处仅支持筛选近半年的统计数据</span>
<span class="fz12 gray">* 此处仅支持筛选近半年的统计数据,最大查询区间为1个月</span>
</div>
</div>
<el-table tooltipEffect="light" :data="tableList" style="width: 100%" v-loading="loading2">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment