Commit 1e902ed2 by Kyle_Li

update: 微盟控制

parent 1d188db6
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
</template> </template>
<!-- 删除的初始状态 --> <!-- 删除的初始状态 -->
<template v-else> <template v-else>
<el-popover placement="top" width="300" trigger="click" v-model="scope.row.showDelPopOver"> <el-popover placement="top" width="300" trigger="click" v-model="scope.row.showDelPopOver" v-if="!scope.row.isWeimob">
<p>选择删除后,请去批处理一键清除所有标签值。</p> <p>选择删除后,请去批处理一键清除所有标签值。</p>
<div style="text-align: right; margin: 5px 0 0 0;"> <div style="text-align: right; margin: 5px 0 0 0;">
<el-button type="text" size="mini" @click.native="scope.row.showDelPopOver = false">取消</el-button> <el-button type="text" size="mini" @click.native="scope.row.showDelPopOver = false">取消</el-button>
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
<div class="add-tag" slot="append"> <div class="add-tag" slot="append" v-if="isShowAdd">
<div class="add-tag-btn" @click="addTagValPop.isShow = true"> <div class="add-tag-btn" @click="addTagValPop.isShow = true">
<i class="iconfont icon-icon02"></i> <i class="iconfont icon-icon02"></i>
添加标签值 添加标签值
...@@ -195,7 +195,8 @@ export default { ...@@ -195,7 +195,8 @@ export default {
animationPos: { animationPos: {
x: 1000, x: 1000,
y: 500 y: 500
} },
isShowAdd: true,
}; };
}, },
computed: { computed: {
...@@ -351,6 +352,7 @@ export default { ...@@ -351,6 +352,7 @@ export default {
} }
}); });
this.tagValTableData = result; this.tagValTableData = result;
if (result.some(v => v.isWeimob)) this.isShowAdd = false;
this.handleRefreshTag(); this.handleRefreshTag();
return; return;
} }
......
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
<p class="tag-name"> <p class="tag-name">
<!--{{ tagName }}--> <!--{{ tagName }}-->
{{showSearchResult ? `【${tagName}】搜索结果` : tagName}} {{showSearchResult ? `【${tagName}】搜索结果` : tagName}}
<el-button type="primary" class="add-newtag" @click="editHandTag()" v-show="handTag == 1">新增标签</el-button> <el-button type="primary" class="add-newtag" @click="editHandTag()" v-show="handTag == 1 && !weimId.includes(groupId)">新增标签</el-button>
<a href="http://demogic.udesk.cn/hc/articles/221271?api_name=&preview=true&preview_as_role=admin&theme_id=18093" target="_blank" class="help-doc">查看帮助文档</a> <a href="http://demogic.udesk.cn/hc/articles/221271?api_name=&preview=true&preview_as_role=admin&theme_id=18093" target="_blank" class="help-doc">查看帮助文档</a>
</p> </p>
<p class="tips" v-if="tagName == '金字塔会员分层' && !memberTagGradeEnsure">暂未开通金字塔分层功能,无法使用该标签,可以联系达摩项目经理进行开通!</p> <p class="tips" v-if="tagName == '金字塔会员分层' && !memberTagGradeEnsure">暂未开通金字塔分层功能,无法使用该标签,可以联系达摩项目经理进行开通!</p>
<tag-container @deleteHandTag="deleteHandTag" :data="memberTagList" :handTag="handTag" :groupId="groupId" :refersh="refershList" @addTag="selectedTag" @editHandTag="editHandTag" ref="tagContainer" /> <tag-container @deleteHandTag="deleteHandTag" :data="memberTagList" :handTag="handTag" :groupId="groupId" :refersh="refershList" @addTag="selectedTag" @editHandTag="editHandTag" ref="tagContainer" :isWeim="weimId.includes(groupId)" />
<div class="page-box" v-if="total > 0"> <div class="page-box" v-if="total > 0">
<dm-pagination <dm-pagination
...@@ -302,6 +302,7 @@ export default { ...@@ -302,6 +302,7 @@ export default {
tagTwoLevelGroupId: '' tagTwoLevelGroupId: ''
}, },
memberTagGradeEnsure: true, // 是否开启会员分层 memberTagGradeEnsure: true, // 是否开启会员分层
weimId: [ '3d11ac15963b4c0790762e6147ea9315', '5bdac971673b4f40a9af981e3c9215bf' ]
}; };
}, },
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<el-popover placement="bottom" width="30" trigger="click"> <el-popover placement="bottom" width="30" trigger="click">
<li class="more" @click="addNewType">新增子分类</li> <li class="more" @click="addNewType">新增子分类</li>
<li class="more" @click="handleEditType">编辑子分类</li> <li class="more" @click="handleEditType">编辑子分类</li>
<i slot="reference" class="el-icon-more icon-tag" v-if="tagName === '手工标签'"></i> <i slot="reference" class="el-icon-more icon-tag" v-if="tagName === '手工标签' && tagList.id !== '3d11ac15963b4c0790762e6147ea9315'"></i>
</el-popover> </el-popover>
<div class="third-list" :class="{ 'manual-tag': tagName === '手工标签' }"> <div class="third-list" :class="{ 'manual-tag': tagName === '手工标签' }">
<!-- <i class="iconfont icon-next-" v-if="tagName === '手工标签'"></i> --> <!-- <i class="iconfont icon-next-" v-if="tagName === '手工标签'"></i> -->
......
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
<el-table-column label="操作" v-if="handTag" min-width="200"> <el-table-column label="操作" v-if="handTag" min-width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <span v-if="scope.row.tagType == 1"> --> <!-- <span v-if="scope.row.tagType == 1"> -->
<el-button type="text" @click="editHandTag(scope.row)">编辑</el-button> <el-button type="text" v-if="!isWeim" @click="editHandTag(scope.row)">编辑</el-button>
<el-button type="text" @click="editHandTagValue(scope.row)">标签值设置</el-button> <el-button type="text" @click="editHandTagValue(scope.row)">标签值设置</el-button>
<el-button type="text" @click="deleteHandTag(scope.row)">删除</el-button> <el-button type="text" v-if="!isWeim" @click="deleteHandTag(scope.row)">删除</el-button>
<!-- </span> --> <!-- </span> -->
</template> </template>
</el-table-column> </el-table-column>
...@@ -58,7 +58,8 @@ export default { ...@@ -58,7 +58,8 @@ export default {
default: false default: false
}, },
groupId: String, groupId: String,
refersh: Object refersh: Object,
isWeim: Boolean
}, },
data() { data() {
......
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