Skip to content

M
memberTag-web
Commit 441e3557 by member
Options

Merge branch 'dev' of 115.159.76.241:memberTag/memberTag-web

parents ff0a1ca0 fe726ba1
Showing with 122 additions and 7 deletions
src/components/tag/tag-config-options.vue
......@@ -666,6 +666,38 @@
<vue-gic-goods-selector ref="selector" @changelist="changelist"></vue-gic-goods-selector>
<!-- <vue-gic-selector ref="selector" @changelist="changelist"></vue-gic-selector> -->
</div>
<!-- 标签值 / 固定时间 / 之后时间 tag024 -->
<template v-if="parent.templateCode == 'tag024'">
<div class="m-b-20" :key="'tag24' + pindex">
<div>
<el-radio v-model="parent.radio" label="1">固定时段</el-radio>
<el-radio v-model="parent.radio" label="2">之后时段</el-radio>
</div>
<!-- 固定时段 -->
<div class="m-t-18 w-500 h-80 fixed-date-picker border-box bg-f3f6f9">
<label class="inline-block middle label-unit m-r-8" v-if="parent.radio == 1">时间范围</label
><el-date-picker
v-model="parent.dateRangeValue"
v-if="parent.radio == 1"
type="daterange"
:editable="false"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
format="yyyy-MM-dd"
value-format="yyyyMMdd"
:picker-options="tag024Options"
><!-- :picker-options="pickerOptions" -->
</el-date-picker>
<div v-if="parent.radio == 2">
<label class="inline-block middle label-unit m-r-8">之后</label
><el-input v-model="parent.afterday" placeholder="请输入" class="w-90 m-r-8" @blur="value => toEditInput(value, 'afterday', parent)"></el-input
><label class="inline-block middle label-unit">天</label>
</div>
</div>
</div>
</template>
</div>
</div>
</template>
......@@ -678,7 +710,7 @@ import VueGicCard from '@/components/card/card';
import { getTagType, findWidget, findOndJson } from '@/request/tagConfig';
// 两个数字区间 numRange [0, 1]
const templateCode = ['tag001', 'tag002', 'tag003', 'tag004', 'tag005', 'tag006', 'tag007', 'tag008', 'tag009', 'tag010', 'tag011', 'tag012', 'tag013', 'tag014', 'tag015', 'tag016', 'tag017', 'tag018'];
const templateCode = ['tag001', 'tag002', 'tag003', 'tag004', 'tag005', 'tag006', 'tag007', 'tag008', 'tag009', 'tag010', 'tag011', 'tag012', 'tag013', 'tag014', 'tag015', 'tag016', 'tag017', 'tag018', 'tag024'];
/**
* checkeditems 多选框
......@@ -925,6 +957,16 @@ export default {
com023: {
},
tag024: {
radio: '1',
dateRangeValue: [],
afterday: ''
},
tag024Options: {
disabledDate(time) {
return time.getTime() < new Date(new Date().toLocaleDateString()).getTime();
}
},
cardListData: []
};
},
......
src/components/tagDetail/mixin/index.js
......@@ -914,6 +914,26 @@ export default {
});
that.postTemplateData.selectedVal.push(that.postTemplateData.selectedVal.join(','));
}
if (ele.templateCode === 'tag024') {
if (ele.radio == 1 && !ele.dateRangeValue.length) {
returnFlag = false;
}
if (ele.radio == 2 && !ele.afterday) {
returnFlag = false;
}
if (ele.radio == 1) {
tagValue.time[0].type = 'between';
tagValue.time[0].value = ele.dateRangeValue.join(',');
that.postTemplateData.selectedVal.push(`时间范围为${ele.dateRangeValue[0]} 至 ${ele.dateRangeValue[1]}`);
}
// tagValue.val[0].data.compute = ele.postCompute;
if (ele.radio == 2) {
tagValue.time[0].type = 'afterday';
tagValue.time[0].value = String(ele.afterday);
that.postTemplateData.selectedVal.push(`时间范围为之后 ${ele.afterday} 天`);
}
}
}
}
......
src/view/memberGroup/memberGroupDetail.vue
......@@ -10,7 +10,10 @@
<span>{{ separator(total) }}</span>
人
</span>
<el-button type="primary" class="down-member-list__btn" @click="downMemberListPop.show = true" v-if="downMemberListPop.canDown">人群导出</el-button>
<el-button type="primary" class="down-member-list__btn" @click="downMemberListPop.show = true" v-if="downMemberListPop.canDown && total < 1000000">人群导出</el-button>
<el-tooltip v-else-if="downMemberListPop.canDown" class="item" effect="dark" content="每张报表导出人数限制为100万，大于100万的人群会自动拆分为多张报表进行导出" placement="top">
<el-button type="primary" class="down-member-list__btn" @click="downMemberListPop.show = true" v-if="downMemberListPop.canDown">人群导出</el-button>
</el-tooltip>
</div>
<div class="memberGroupDetail-wrap__head">
<span class="tag-selected-title">筛选标签</span>
......@@ -18,6 +21,16 @@
</div>
<div class="memberGroupDetail-wrap__table">
<el-input
class="w-220 m-r-8"
placeholder="请输入会员卡号、手机号"
prefix-icon="el-icon-search"
v-model="tagSearch"
clearable
style="margin: 20px 0"
@clear="clearSearch"
@keyup.enter.native="enterSearch"
/>
<el-table v-loading="loading" @sort-change="sortChange" :data="memberGroupDetailData" style="width: 100%">
<div v-for="item in selectedFields" :key="item.code">
<el-table-column
......@@ -350,7 +363,8 @@ export default {
},
baseUrl: '',
sortFiled: '',
order: ''
order: '',
tagSearch: ''
};
},
computed: {
......@@ -534,7 +548,8 @@ export default {
pageNum: that.currentPage,
pageSize: that.pageSize,
sortColName: that.sortFiled,
sortType: that.order
sortType: that.order,
search: that.tagSearch
};
getRequest('/member-tag-member/findMemberList.json', params)
.then(res => {
......@@ -556,6 +571,15 @@ export default {
that.loading = false;
});
},
clearSearch() {
this.tagSearch = '';
this.currentPage = 1;
this.getGroupDetail();
},
enterSearch() {
this.currentPage = 1;
this.getGroupDetail();
},
/**
* 点击信息跳转分组详情
*/
......
src/view/memberGroup/memberGroupList.vue
......@@ -211,6 +211,11 @@
{{ (scope.row.memberCount || 0) | formatNum }} 人
</template>
</el-table-column>
<el-table-column prop="appStatus" label="好办展示" >
<template slot-scope="scope">
<el-switch :active-value="1" :inactive-value="0" v-model="scope.row.appStatus" active-color="#1890ff" @change="switchAppStatus(scope.row.appStatus, scope.row)"> </el-switch>
</template>
</el-table-column>
<el-table-column label="操作" width="150px">
<template slot-scope="scope">
<router-link
......
src/view/memberGroup/memberLevelDetail.vue
......@@ -11,9 +11,22 @@
<span>{{ separator(total) }}</span>
人
</span>
<el-button type="primary" class="down-member-list__btn" @click="downMemberListPop.show = true" v-if="downMemberListPop.canDown">人群导出</el-button>
<el-button type="primary" class="down-member-list__btn" @click="downMemberListPop.show = true" v-if="downMemberListPop.canDown && total < 1000000">人群导出</el-button>
<el-tooltip v-else-if="downMemberListPop.canDown" class="item" effect="dark" content="每张报表导出人数限制为100万，大于100万的人群会自动拆分为多张报表进行导出" placement="top">
<el-button type="primary" class="down-member-list__btn" @click="downMemberListPop.show = true" v-if="downMemberListPop.canDown">人群导出</el-button>
</el-tooltip>
</div>
<div class="memberGroupDetail-wrap__table">
<el-input
class="w-220 m-r-8"
placeholder="请输入会员卡号、手机号"
prefix-icon="el-icon-search"
v-model="tagSearch"
clearable
style="margin: 20px 0"
@clear="clearSearch"
@keyup.enter.native="enterSearch"
/>
<el-table v-loading="loading" @sort-change="sortChange" :data="memberGroupDetailData" style="width: 100%">
<div v-for="item in selectedFields" :key="item.code">
<el-table-column
......@@ -350,7 +363,8 @@ export default {
},
baseUrl: '',
sortFiled: '',
order: ''
order: '',
tagSearch: ''
};
},
computed: {
......@@ -542,7 +556,8 @@ export default {
pageSize: this.pageSize,
pageName: 'memberSign',
sortColName: that.sortFiled,
sortType: that.order
sortType: that.order,
search: that.tagSearch
};
getRequest('/member-tag-member/findMemberList.json', params)
.then(res => {
......@@ -563,6 +578,15 @@ export default {
that.loading = false;
});
},
clearSearch() {
this.tagSearch = '';
this.currentPage = 1;
this.getGroupDetail();
},
enterSearch() {
this.currentPage = 1;
this.getGroupDetail();
},
/**
* 点击信息跳转分组详情
*/
......
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