Commit 282a0055 by crushh

update: dist

parent 1b7cf2a0
......@@ -288,7 +288,7 @@ import tagPop from '@/views/ai/task/tagPop.vue';
import { formatDateTimeByType, _debounce } from '@/utils/index';
import gicNewMemberGroup from '@/components/dm-new-member-group/index.vue';
import ruleFilter from '@/components/dm-new-rule/ruleFilter.vue';
import { enableAccessControl } from '@/utils/auth.js';
export default {
mixins: [filterAvater],
data() {
......@@ -469,7 +469,8 @@ export default {
}
},
created() {
if (this.$store.state.marketing.superAdmin != 1) {
if (this.$store.state.marketing.superAdmin != 1 && enableAccessControl()) {
// 不是超管且开启分权 不展示金字塔分层
this.showTabs = [0, 1];
}
},
......
......@@ -34,7 +34,7 @@
</el-select>
</el-form-item>
<el-form-item>
<el-date-picker v-model="form.time" :picker-options="pickerOptions" value-format="yyyy-MM-dd" @change="search" type="daterange" range-separator="~" start-placeholder="开始日期" end-placeholder="结束日期" clearable> </el-date-picker>
<el-date-picker :clearable="false" v-model="form.time" :picker-options="pickerOptions" value-format="timestamp" @change="search" type="daterange" range-separator="~" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
</el-form-item>
</el-form>
</div>
......@@ -94,7 +94,7 @@ import { page, rechargeCenter, stopActivityPlan, startActivityPlan, pageStatisti
import { formatDateTimeByType } from '@/utils/index.js';
import filterAvater from '@/mixins/filterAvater.js';
import dmDropdown from '@/components/dm-drop-down/dm-drop-down';
const maxTimeRange = 180 * 24 * 60 * 60 * 1000; // 6个月
export default {
mixins: [filterAvater],
data() {
......@@ -106,14 +106,13 @@ export default {
activityName: '',
scene: '',
activityPlanStatus: '',
time: [],
time: [new Date().getTime() - maxTimeRange, new Date().getTime() + maxTimeRange],
pageNum: 1,
pageSize: 20
},
total: 0,
pickerOptions: {
disabledDate: time => {
const maxTimeRange = 180 * 24 * 60 * 60 * 1000; // 6个月
return time.getTime() < new Date().getTime() - maxTimeRange || time.getTime() > new Date().getTime() + maxTimeRange;
}
},
......@@ -408,8 +407,8 @@ export default {
this.loading = true;
const params = Object.assign({}, this.form);
if (params.time && params.time.length) {
params.startTime = params.time[0];
params.endTime = params.time[1];
params.startTime = formatDateTimeByType(params.time[0], 'yyyy-MM-dd');
params.endTime = formatDateTimeByType(params.time[1], 'yyyy-MM-dd');
}
delete params.time;
......
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