Commit 5a84b75c by liuchenxi

update: 分组调整

parent 02079b6f
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<div class="cre-btn" v-if="!(operNum == 1 && list.length)"> <div class="cre-btn" v-if="!(operNum == 1 && list.length)">
<el-button @click="closeBatch">取 消</el-button> <el-button @click="closeBatch">取 消</el-button>
<el-button type="primary" @click="confirmBatch">确 定</el-button> <el-button type="primary" @click="confirmBatch">{{ !operNum ? '失 效' : operNum == 1 ? '删 除' : '确 定'}}</el-button>
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
...@@ -192,9 +192,6 @@ export default { ...@@ -192,9 +192,6 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
/deep/ .el-dialog__body {
padding-bottom: 24px;
}
.batch-txt { .batch-txt {
padding-left: 35px; padding-left: 35px;
padding-top: 7px; padding-top: 7px;
......
...@@ -1336,7 +1336,6 @@ export default { ...@@ -1336,7 +1336,6 @@ export default {
methods: { methods: {
// 设置门店选择器的场景 // 设置门店选择器的场景
storeTagScense(parent) { storeTagScense(parent) {
console.log(parent);
if (!parent.expandParams) return ''; if (!parent.expandParams) return '';
const controlJson = JSON.parse(parent.expandParams); const controlJson = JSON.parse(parent.expandParams);
const scense = controlJson.find(el => el.key === 'scenes'); const scense = controlJson.find(el => el.key === 'scenes');
...@@ -1560,6 +1559,7 @@ export default { ...@@ -1560,6 +1559,7 @@ export default {
// this[data.templateCode] = Object.create(null); // this[data.templateCode] = Object.create(null);
this[data.templateCode].postCompute = this.postCompute; this[data.templateCode].postCompute = this.postCompute;
} }
console.log(11111111111111111);
// 如果直接给需要字段 // 如果直接给需要字段
if (data.sourceFlag >> 0 === 0) { if (data.sourceFlag >> 0 === 0) {
data.widgetValues = JSON.parse(data.widgetValues); data.widgetValues = JSON.parse(data.widgetValues);
...@@ -1569,6 +1569,7 @@ export default { ...@@ -1569,6 +1569,7 @@ export default {
} }
// 如果通过 url 获取 // 如果通过 url 获取
if (data.sourceFlag >> 0 === 1) { if (data.sourceFlag >> 0 === 1) {
console.log(data);
data.widgetParam = JSON.parse(data.widgetParam); data.widgetParam = JSON.parse(data.widgetParam);
this.getAsyncList(data.widgetParam[0].value, this[data.templateCode]); this.getAsyncList(data.widgetParam[0].value, this[data.templateCode]);
if (data.templateCode === 'tag009' || data.templateCode === 'tag010') { if (data.templateCode === 'tag009' || data.templateCode === 'tag010') {
...@@ -1578,9 +1579,10 @@ export default { ...@@ -1578,9 +1579,10 @@ export default {
if (this.templateDataList.editCondition) { if (this.templateDataList.editCondition) {
this.asyncTemplateList(); this.asyncTemplateList();
} }
}, 200); }, 800);
return false; return false;
} }
console.log('22222222222222222');
// 调整商品选择器顺序 // 调整商品选择器顺序
if (data.templateCode == 'com022') { if (data.templateCode == 'com022') {
setTimeout(_ => { setTimeout(_ => {
...@@ -1625,6 +1627,7 @@ export default { ...@@ -1625,6 +1627,7 @@ export default {
* 这里拿到编辑的数据 然后把tagValue的value值传解析传给模板的v-model * 这里拿到编辑的数据 然后把tagValue的value值传解析传给模板的v-model
* 写一个方法 把模板code定位配置code来处理这么多的模板 * 写一个方法 把模板code定位配置code来处理这么多的模板
*/ */
console.log('12312312312');
setTimeout(_ => { setTimeout(_ => {
this.templateCode = this.templateData.map(el => el.templateCode); this.templateCode = this.templateData.map(el => el.templateCode);
if (this.templateDataList.editCondition) { if (this.templateDataList.editCondition) {
...@@ -1646,7 +1649,6 @@ export default { ...@@ -1646,7 +1649,6 @@ export default {
let tagValue = JSON.parse(this.templateDataList.tagValue); let tagValue = JSON.parse(this.templateDataList.tagValue);
let value = null; let value = null;
let checkedCount = null; let checkedCount = null;
for (let tem of this.templateData) { for (let tem of this.templateData) {
switch (tem.templateCode) { switch (tem.templateCode) {
case 'tag013': case 'tag013':
...@@ -1861,12 +1863,10 @@ export default { ...@@ -1861,12 +1863,10 @@ export default {
replaceTemplateValue() { replaceTemplateValue() {
// 回显数据 // 回显数据
let tagValue = JSON.parse(this.templateDataList.tagValue); let tagValue = JSON.parse(this.templateDataList.tagValue);
console.log(tagValue, this.templateDataList);
let tagParams = JSON.parse(this.templateDataList.tagParams); let tagParams = JSON.parse(this.templateDataList.tagParams);
let value = null; let value = null;
let selectVal = null; let selectVal = null;
let checkedCount = null; let checkedCount = null;
// compute 是计算属性的区间值 value是选中的值 // compute 是计算属性的区间值 value是选中的值
for(let i = 0; i < this.templateDataList.templateCode.length; i++) { for(let i = 0; i < this.templateDataList.templateCode.length; i++) {
switch (this.templateDataList.templateCode[i]) { switch (this.templateDataList.templateCode[i]) {
...@@ -1914,7 +1914,6 @@ export default { ...@@ -1914,7 +1914,6 @@ export default {
this.templateData[i].checkAll = checkedCount == this.templateData[i].options.length; this.templateData[i].checkAll = checkedCount == this.templateData[i].options.length;
this.templateData[i].isIndeterminate = checkedCount > 0 && checkedCount < this.templateData[i].options.length; this.templateData[i].isIndeterminate = checkedCount > 0 && checkedCount < this.templateData[i].options.length;
break; break;
case 'tag013': case 'tag013':
value = tagValue.val[0].data.value.split(' '); value = tagValue.val[0].data.value.split(' ');
for (let i = 0; i < this.templateData.length; i++) { for (let i = 0; i < this.templateData.length; i++) {
...@@ -1996,7 +1995,6 @@ export default { ...@@ -1996,7 +1995,6 @@ export default {
selectVal = tagParams.selectedVal[1].split(','); selectVal = tagParams.selectedVal[1].split(',');
this.templateData[i].searchModel = selectVal; this.templateData[i].searchModel = selectVal;
this.templateData[i].addSelectTags = value.map((el, idx) => ({value: labels[idx], id: el, clerkId: el, clerkName: labels[idx]})); this.templateData[i].addSelectTags = value.map((el, idx) => ({value: labels[idx], id: el, clerkId: el, clerkName: labels[idx]}));
console.log(this.templateData);
// console.log(this.templateData[i].searchModel); // console.log(this.templateData[i].searchModel);
// console.log(this.templateData[i].addSelectTags); // console.log(this.templateData[i].addSelectTags);
// selectVal.forEach((el, inx) => { // selectVal.forEach((el, inx) => {
...@@ -2025,7 +2023,6 @@ export default { ...@@ -2025,7 +2023,6 @@ export default {
this.loadSelector = true; this.loadSelector = true;
} }
} }
console.log(this.templateData[i]);
break; break;
case 'tag004': case 'tag004':
......
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
</template> </template>
<template v-else> <template v-else>
<div class="right-box" v-show="!isRecommend"> <div class="right-box" v-show="!isRecommend">
<div class="common-wrap__opt"> <div class="common-wrap__opt" style="min-width: 1020px">
<div class="top"> <div class="top">
<p class="tips">实时分组数据实时更新,非实时分组数据每天凌晨更新 1 次,非实时分组失效后数据会自动清空。</p> <p class="tips">实时分组数据实时更新,非实时分组数据每天凌晨更新 1 次,非实时分组失效后数据会自动清空。</p>
<div class="title m-b-20 m-t-16"> <div class="title m-b-20 m-t-16">
...@@ -220,12 +220,12 @@ ...@@ -220,12 +220,12 @@
<el-button type="primary" :limit-code="$buttonCode.memberTagAddGroup" @click="toAddGroup" class="fr">新增分组</el-button> <el-button type="primary" :limit-code="$buttonCode.memberTagAddGroup" @click="toAddGroup" class="fr">新增分组</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="look-self m-t-12 m-b-20" v-if="[2,3].includes($store.state.departAuth) || $store.state.isSuperAdmin"> <span class="look-self m-l-10" v-if="[2,3].includes($store.state.departAuth) || $store.state.isSuperAdmin">
<el-checkbox v-model="isSelf"> <el-checkbox v-model="isSelf">
仅看本人 仅看本人
<el-tooltip placement="top" trigger="hover" content="其它账号创建的分组覆盖人数根据创建人管辖门店查询数据"><i class="iconfont icon-QuestionCircleOutlined icon" /></el-tooltip> <el-tooltip placement="top" trigger="hover" content="其它账号创建的分组覆盖人数根据创建人管辖门店查询数据"><i class="iconfont icon-QuestionCircleOutlined icon" /></el-tooltip>
</el-checkbox> </el-checkbox>
</div> </span>
</div> </div>
<div class="common-wrap__table m-t-20"> <div class="common-wrap__table m-t-20">
<el-table <el-table
...@@ -261,10 +261,7 @@ ...@@ -261,10 +261,7 @@
状态 状态
<el-tooltip effect="dark" placement="top"> <el-tooltip effect="dark" placement="top">
<div slot="content"> <div slot="content">
<p>失效的实时分组仍然会更新人数,失效的非实时分组不再更新人数。</p> <p>失效的非实时分组不再更新人数,营销活动无法选用失效的分组</p>
<p>新的营销活动无法选用失效的分组。</p>
<p>如果某营销活动曾经选用了分组,分组失效后,实时分组不影响活动的投放执行,非实时分组的活动则投放人群数据会清空(手动失效的会立马清空,当天内手动恢复有效则投放人数保留,但到期失效的待次日清空)。</p>
<p>另外失效后隔天手动恢复有效,需要等待次日更新投放人数。</p>
</div> </div>
<i class="iconfont icon-QuestionCircleOutlined icon"></i> <i class="iconfont icon-QuestionCircleOutlined icon"></i>
</el-tooltip> </el-tooltip>
......
...@@ -83,10 +83,11 @@ ...@@ -83,10 +83,11 @@
<!-- 我的标签 --> <!-- 我的标签 -->
<div class="my-pop-tagbox" @click="expendsGroupList" :limit-code="$buttonCode.memberTagCreateGroup" v-if="$getButtonLimit($buttonCode.memberTagCreateGroup)"> <div class="my-pop-tagbox" @click="expendsGroupList" :limit-code="$buttonCode.memberTagCreateGroup" v-if="$getButtonLimit($buttonCode.memberTagCreateGroup)">
<p class="txt"> <p class="txt">
<i class="iconfont icon-shougongbiaoqian" style="margin-bottom:2px"></i> <el-badge :value="groupListNumber">
已选标签 <i class="iconfont icon-biaoqian" style="margin-bottom:2px"></i>
</el-badge>
<span>已选标签</span>
</p> </p>
<p class="number-txt">{{ groupListNumber }}</p>
</div> </div>
</div> </div>
</div> </div>
...@@ -1003,20 +1004,32 @@ export default { ...@@ -1003,20 +1004,32 @@ export default {
z-index: 10; z-index: 10;
right: 29px; right: 29px;
bottom: 230px; bottom: 230px;
height: 120px; height: 90px;
width: 45px; width: 45px;
// color: #fff; // color: #fff;
background-color: #fff; background-color: #fff;
box-shadow: 0px 4px 12px 0px rgba(220, 223, 230, 0.6);
color: #2f54eb; color: #2f54eb;
box-shadow: 0 0 7px #7795b152;
// border-radius: 50%; // border-radius: 50%;
cursor: pointer; cursor: pointer;
.txt { .txt {
padding: 10px 13px 0; padding: 9px 8px 7px 11px;
text-align: center; text-align: center;
// padding-top: 25px; // padding-top: 25px;
font-size: 14px; font-size: 14px;
line-height: 17px; line-height: 17px;
i {
font-size: 24px;
position: relative;
top: 3px;
}
span {
margin-top: 9px;
display: inline-block;
width: 28px;
color: #303133;
line-height: 20px;
}
} }
.number-txt { .number-txt {
text-align: center; text-align: center;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!-- 具体标签 --> <!-- 具体标签 -->
<div class="tag-some-list"> <div class="tag-some-list">
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%">
<el-table-column label="标签名称" prop="tagName" min-width="230" fixed="left"> <el-table-column label="标签名称" prop="tagName" min-width="130" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="tag-name">{{ scope.row.tagName }}</span> <span class="tag-name">{{ scope.row.tagName }}</span>
<el-tooltip class="item" effect="dark" content="添加标签" placement="bottom"> <el-tooltip class="item" effect="dark" content="添加标签" placement="bottom">
...@@ -224,9 +224,14 @@ export default { ...@@ -224,9 +224,14 @@ export default {
margin: 0 20px; margin: 0 20px;
overflow-y: auto; overflow-y: auto;
} }
.tag-name {
display: inline-block;
word-break: break-all;
width: 80px;
}
.icon-tag-name { .icon-tag-name {
display: inline-block; display: inline-block;
vertical-align: bottom; vertical-align: top;
font-size: 16px; font-size: 16px;
cursor: pointer; cursor: pointer;
color: #303133; color: #303133;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!-- 具体标签 --> <!-- 具体标签 -->
<div class="tag-some-list"> <div class="tag-some-list">
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%">
<el-table-column label="标签名称" prop="tagName" min-width="230" fixed> <el-table-column label="标签名称" prop="tagName" min-width="130" fixed>
<template slot-scope="scope"> <template slot-scope="scope">
<span class="tag-name">{{ scope.row.tagName }}</span> <span class="tag-name">{{ scope.row.tagName }}</span>
<el-tooltip class="item" effect="dark" content="添加标签" placement="top"> <el-tooltip class="item" effect="dark" content="添加标签" placement="top">
...@@ -117,9 +117,14 @@ export default { ...@@ -117,9 +117,14 @@ export default {
margin: 0 20px; margin: 0 20px;
overflow-y: auto; overflow-y: auto;
} }
.tag-name {
display: inline-block;
word-break: break-all;
width: 80px;
}
.icon-tag-name { .icon-tag-name {
display: inline-block; display: inline-block;
vertical-align: bottom; vertical-align: top;
font-size: 16px; font-size: 16px;
cursor: pointer; cursor: pointer;
color: #303133; color: #303133;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!-- 具体标签 --> <!-- 具体标签 -->
<div class="tag-some-list"> <div class="tag-some-list">
<el-table :data="tableData" style="width: 100%" @sort-change="sortChange"> <el-table :data="tableData" style="width: 100%" @sort-change="sortChange">
<el-table-column label="标签名称" prop="tagName" min-width="230" fixed> <el-table-column label="标签名称" prop="tagName" min-width="130" fixed>
<template slot-scope="scope"> <template slot-scope="scope">
<span class="tag-name">{{ scope.row.tagName }}</span> <span class="tag-name">{{ scope.row.tagName }}</span>
<el-tooltip class="item" effect="dark" content="添加标签" placement="bottom"> <el-tooltip class="item" effect="dark" content="添加标签" placement="bottom">
...@@ -281,9 +281,14 @@ export default { ...@@ -281,9 +281,14 @@ export default {
.tag-some-list { .tag-some-list {
margin: 0 20px; margin: 0 20px;
} }
.tag-name {
display: inline-block;
word-break: break-all;
width: 80px;
}
.icon-tag-name { .icon-tag-name {
display: inline-block; display: inline-block;
vertical-align: bottom; vertical-align: top;
font-size: 16px; font-size: 16px;
cursor: pointer; cursor: pointer;
transition: all .3s; transition: all .3s;
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
.cre-dialog { .cre-dialog {
.el-dialog__body { .el-dialog__body {
padding: 10px 20px; padding: 10px 20px 20px;
} }
.cre-btn { .cre-btn {
padding-top: 20px; padding-top: 20px;
......
...@@ -82,6 +82,8 @@ summary, ...@@ -82,6 +82,8 @@ summary,
time, time,
mark, mark,
audio, audio,
textarea,
input,
video { video {
margin: 0; margin: 0;
padding: 0; padding: 0;
......
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