314637581
/
flossom-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

企微标签更改为外部标签

Browse Source
master
elliott 2 years ago
parent 72931705d2
commit 7fca12a31f
25 changed files with 79 additions and 79 deletions
Show Stats Download Patch File Download Diff File

20
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SiteInfo.java
Unescape Escape View File

@ -91,12 +91,12 @@ public class SiteInfo extends BaseEntity
@Excel(name = "可见小程序标签ID")
private String showWechatTagId;
/** 可见企微标签 */
@Excel(name = "可见企微标签")
/** 可见外部标签 */
@Excel(name = "可见外部标签")
private String showCompanyTag;
private List<Long> showCompanyTagArray = new ArrayList<Long>();
/** 可见企微标签ID */
@Excel(name = "可见企微标签ID")
/** 可见外部标签ID */
@Excel(name = "可见外部标签ID")
private String showCompanyTagId;
/** 禁止小程序标签 */
@ -107,13 +107,13 @@ public class SiteInfo extends BaseEntity
@Excel(name = "禁止小程序标签ID")
private String forbidWechatTagId;
/** 禁止企微标签 */
@Excel(name = "禁止企微标签")
/** 禁止外部标签 */
@Excel(name = "禁止外部标签")
private String forbidCompanyTag;
private List<Long> forbidCompanyTagArray = new ArrayList<Long>();
/** 禁止企微标签ID */
@Excel(name = "禁止企微标签ID")
/** 禁止外部标签ID */
@Excel(name = "禁止外部标签ID")
private String forbidCompanyTagId;
/** 渠道名称 */
@ -137,8 +137,8 @@ public class SiteInfo extends BaseEntity
private String handlerCompanyTagId;
private List<Long> handlerCompanyTagArray = new ArrayList<Long>();
/** 获取企微标签 */
@Excel(name = "获取企微标签")
/** 获取外部标签 */
@Excel(name = "获取外部标签")
private String handlerCompanyTag;
@Excel(name = "获取小程序标签")

2
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysTag.java
Unescape Escape View File

@ -51,7 +51,7 @@ public class SysTag extends BaseEntity
/** 邮箱 */
private String email;
/** 标签状态:1小程序标签,2企微标签 */
/** 标签状态:1小程序标签,2外部标签 */
@Excel(name = "标签类型")
private String type;

4
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxModeTag.java
Unescape Escape View File

@ -26,8 +26,8 @@ public class WxModeTag extends BaseEntity
@Excel(name = "标签主键")
private Long tagId;
/** 标签类型（1小程序标签 2企微标签） */
@Excel(name = "标签类型", readConverterExp = "1=小程序标签,2=企微标签")
/** 标签类型（1小程序标签 2外部标签） */
@Excel(name = "标签类型", readConverterExp = "1=小程序标签,2=外部标签")
private Long tagType;
/** 状态（0正常 1禁用） */

6
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxScriptTemplate.java
Unescape Escape View File

@ -39,7 +39,7 @@ public class WxScriptTemplate extends BaseEntity
private String tagNames;
/** 标签名字 */
@Excel(name = "企微标签名字")
@Excel(name = "外部标签名字")
private String companyTagNames;
/** 标签ID */
@ -50,8 +50,8 @@ public class WxScriptTemplate extends BaseEntity
@Excel(name = "话术等级：1一级 2 二级")
private Long level;
/** 1小程序标签 2企微标签 */
@Excel(name = "1小程序标签 2企微标签")
/** 1小程序标签 2外部标签 */
@Excel(name = "1小程序标签 2外部标签")
private Integer tagType;
/** 跳转类型：0无跳转、1跳转内部链接、3跳转外部链接、4跳转小程序、5导向视频号、6导向视频号直播间 */

2
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserScriptLog.java
Unescape Escape View File

@ -59,7 +59,7 @@ public class WxUserScriptLog extends BaseEntity {
private String content;
/**
* 标签类型：1小程序标签 2企微标签
* 标签类型：1小程序标签 2外部标签
*/
private Integer tagType;

2
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxUserMemberExport.java
Unescape Escape View File

@ -83,7 +83,7 @@ public class WxUserMemberExport {
@Excel(name = "用户注册时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@Excel(name = "企微标签")
@Excel(name = "外部标签")
String wecomTags;
@Excel(name = "小程序标签")

2
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberReq.java
Unescape Escape View File

@ -52,7 +52,7 @@ public class WxUserMemberReq {
private Date birthday;
/**
* 企微标签
* 外部标签
*/
List<Integer> wecomTags;

4
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java
Unescape Escape View File

@ -98,12 +98,12 @@ public class WxUserMemberVm extends BaseEntity {
List<Integer> purchaseChannels;
/**
* 企微标签
* 外部标签
*/
List<Integer> wecomTags;
/**
* 企微标签个数
* 外部标签个数
*/
Integer wecomTagNum;

2
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserScriptReq.java
Unescape Escape View File

@ -50,7 +50,7 @@ public class WxUserScriptReq {
private String content;
/**
* 标签类型：1小程序标签 2企微标签
* 标签类型：1小程序标签 2外部标签
*/
private Integer tagType;

2
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxUserMemberRet.java
Unescape Escape View File

@ -24,7 +24,7 @@ public class WxUserMemberRet extends WxUserMember {
private List<WxUserTag> miniProgramTags;
/**
* 企微标签
* 外部标签
*/
private List<WxUserTag> wecomTags;

2
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/vo/WxUserMemberVo.java
Unescape Escape View File

@ -156,7 +156,7 @@ public class WxUserMemberVo {
private List<WxUserRemark> wxUserRemarkList;
/**
* 企微标签
* 外部标签
*/
private List<Long> wecomTags;

8
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SiteInfoServiceImpl.java
Unescape Escape View File

@ -92,7 +92,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService {
List<Integer> userIdList = Arrays.asList(SecurityUtils.getLoginUser().getWxUserMember().getId()).stream().map(Long::intValue).collect(Collectors.toList());
batchAddTag(tagIdList, userIdList, TagTypeStatus.MINI_PROGRAM.getCode());
}
// 企微标签
// 外部标签
siteInfoTag.setTagType(TagTypeStatus.ENTERPRISE_WECHAT.getCode());
siteInfoTag.setStatus(2L);
List<SiteInfoTag> addWecomTagList = siteInfoTagMapper.selectSiteInfoTagList(siteInfoTag);
@ -150,7 +150,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService {
* @return
*/
private List<SiteInfo> filterSite(List<SiteInfo> siteInfos) {
/* 获取用户拥有的小程序标签和企微标签 */
/* 获取用户拥有的小程序标签和外部标签 */
List<Long> userMiniTageIdList = new ArrayList<>();
List<Long> userWecomTageIdList = new ArrayList<>();
WxUserMember wxUserMember = SecurityUtils.getLoginUser().getWxUserMember();
@ -163,7 +163,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService {
userMiniTageIdList = userMiniProgramTags.stream().map(WxUserTag::getTagId).collect(Collectors.toList());
}
wxUserTag.setType(TagTypeStatus.ENTERPRISE_WECHAT.getCode());
// 用户拥有的企微标签
// 用户拥有的外部标签
List<WxUserTag> userWecomTags = wxUserTagMapper.selectWxUserTagList(wxUserTag);
if (userWecomTags != null && userWecomTags.size() > 0) {
userWecomTageIdList = userWecomTags.stream().map(WxUserTag::getTagId).collect(Collectors.toList());
@ -262,7 +262,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService {
continue;
}
}
// 4.5、可见企微标签
// 4.5、可见外部标签
siteInfoTag.setSiteId(info.getId());
siteInfoTag.setTagType(TagTypeStatus.ENTERPRISE_WECHAT.getCode());
siteInfoTag.setStatus(0L);

6
flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysTagController.java
Unescape Escape View File

@ -158,7 +158,7 @@ public class SysTagController extends BaseController {
}
/**
* 获取企微标签
* 获取外部标签
*
* @return
*/
@ -180,14 +180,14 @@ public class SysTagController extends BaseController {
if (TagTypeStatus.MINI_PROGRAM.getCode().toString().equals(tag.getType())) {
sheetName += "小程序标签数据"+ s ;
} else {
sheetName += "企微标签数据"+ s ;
sheetName += "外部标签数据"+ s ;
}
List<SysTag> list = tagService.selectDeptList(tag);
for (SysTag sysTag: list) {
if (TagTypeStatus.MINI_PROGRAM.getCode().toString().equals(sysTag.getType())) {
sysTag.setType("小程序标签");
} else {
sysTag.setType("企微标签");
sysTag.setType("外部标签");
}
if (0 == sysTag.getParentId()) {
sysTag.setParentName(sysTag.getTagName());

18
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoServiceImpl.java
Unescape Escape View File

@ -72,7 +72,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService
// 查询用的标签关联实体
SiteInfoTag infoTag = new SiteInfoTag();
infoTag.setSiteId(id);
// 处理禁用企微标签数组
// 处理禁用外部标签数组
if (StringUtils.isNotEmpty(siteInfo.getForbidCompanyTagId())) {
// 关联表查询数据
infoTag.setTagType(2);
@ -99,7 +99,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService
List<Long> showWechatList = siteInfoTags.stream().map(SiteInfoTag::getTagId).collect(Collectors.toList());
siteInfo.setShowWechatTagArray(showWechatList);
}
// 处理可见企微标签数组
// 处理可见外部标签数组
if (StringUtils.isNotEmpty(siteInfo.getShowCompanyTagId())) {
// 关联表查询数据
infoTag.setTagType(2);
@ -117,7 +117,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService
List<Long> handlerWechatList = siteInfoTags.stream().map(SiteInfoTag::getTagId).collect(Collectors.toList());
siteInfo.setHandlerWechatTagArray(handlerWechatList);
}
// 处理弹窗活动企微标签
// 处理弹窗活动外部标签
if (StringUtils.isNotEmpty(siteInfo.getHandlerCompanyTagId())){
// 关联表查询数据
infoTag.setTagType(2);
@ -193,7 +193,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService
infoTag.setCreateTime(DateUtils.getNowDate());
siteInfoTagMapper.insertSiteInfoTag(infoTag);
}
// 保存可见企微标签关联关系
// 保存可见外部标签关联关系
for (SysTag tag: showCompanyTagNew) {
SiteInfoTag infoTag = new SiteInfoTag();
infoTag.setSiteId(siteInfo.getId());
@ -215,7 +215,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService
infoTag.setCreateTime(DateUtils.getNowDate());
siteInfoTagMapper.insertSiteInfoTag(infoTag);
}
// 保存禁用企微标签关联关系
// 保存禁用外部标签关联关系
for (SysTag tag: forbidCompanyTagNew) {
SiteInfoTag infoTag = new SiteInfoTag();
infoTag.setSiteId(siteInfo.getId());
@ -247,7 +247,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService
infoTag.setCreateTime(DateUtils.getNowDate());
siteInfoTagMapper.insertSiteInfoTag(infoTag);
}
// 保存获得企微标签关联关系
// 保存获得外部标签关联关系
for (SysTag tag: handlerCompanyTagNew) {
SiteInfoTag infoTag = new SiteInfoTag();
infoTag.setSiteId(siteInfo.getId());
@ -291,7 +291,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService
String ids = StringUtils.join(resultList, ",");
siteInfo.setShowWechatTagId(ids);
}
// 保存可见企微标签
// 保存可见外部标签
if (!CollectionUtils.isEmpty(siteInfo.getShowCompanyTagArray())) {
List<Long> showCompanyTagArray = siteInfo.getShowCompanyTagArray();
for(long tagId : showCompanyTagArray) {
@ -325,7 +325,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService
String ids = StringUtils.join(resultList, ",");
siteInfo.setForbidWechatTagId(ids);
}
// 保存禁用企微标签
// 保存禁用外部标签
if (!CollectionUtils.isEmpty(siteInfo.getForbidCompanyTagArray())) {
List<Long> forbidCompanyTagArray = siteInfo.getForbidCompanyTagArray();
for(long tagId : forbidCompanyTagArray) {
@ -343,7 +343,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService
siteInfo.setForbidCompanyTagId(ids);
}
// 保存获得企微标签
// 保存获得外部标签
if (!CollectionUtils.isEmpty(siteInfo.getHandlerCompanyTagArray())) {
List<Long> handlerCompanyTagArray = siteInfo.getHandlerCompanyTagArray();
for(long tagId : handlerCompanyTagArray) {

2
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java
Unescape Escape View File

@ -215,7 +215,7 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
WxInstrument wxInstrument = new WxInstrument();
BeanUtils.copyProperties(wxInstrumentSaveReq, wxInstrument);
// 处理小程序标签和企微标签
// 处理小程序标签和外部标签
if (wxInstrumentSaveReq.getMiniTagIds() != null) {
List<String> tagIdList = Arrays.asList(wxInstrumentSaveReq.getMiniTagIds().split(","));
StringBuilder tagNames = new StringBuilder();

6
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java
Unescape Escape View File

@ -81,7 +81,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
collect = miniProgramUserTagList.stream().map(WxUserTag::getTagId).collect(Collectors.toList());
}
wxUserMemberVo.setMiniProgramTags(collect);
// 查询企微标签
// 查询外部标签
query.setType(TagTypeStatus.ENTERPRISE_WECHAT.getCode());
List<WxUserTag> wecomUserTags = wxUserTagMapper.selectWxUserTagList(query);
collect = null;
@ -169,7 +169,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
if (wxUserMemberReq.getMiniProgramTags() != null && wxUserMemberReq.getMiniProgramTags().size() > 0) {
batchAddMiniProgramTag(wxUserMemberReq.getMiniProgramTags(), userIdList);
}
// 添加用户与企微标签关联
// 添加用户与外部标签关联
if (wxUserMemberReq.getWecomTags() != null && wxUserMemberReq.getWecomTags().size() > 0) {
batchAddWecomTag(wxUserMemberReq.getWecomTags(), userIdList);
}
@ -226,7 +226,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
}
/**
* 批量添加企微标签
* 批量添加外部标签
*
* @param tagIdList
* @param userIdList

2
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserScriptLogServiceImpl.java
Unescape Escape View File

@ -153,7 +153,7 @@ public class WxUserScriptLogServiceImpl implements IWxUserScriptLogService {
.map(WxScriptTag::getTagId)
.map(Long::intValue)
.collect(Collectors.toList());
// 企微标签集合
// 外部标签集合
List<Integer> wecomTagIdList = wxScriptTagList.stream()
.filter(scriptTag -> TagTypeStatus.ENTERPRISE_WECHAT.getCode().equals(scriptTag.getTagType()))
.map(WxScriptTag::getTagId)

2
flossom-ui/src/api/system/instrument.js
Unescape Escape View File

@ -54,7 +54,7 @@ export function getMiniProgramTagTree() {
})
}
/* 获取企微标签树 */
/* 获取外部标签树 */
export function getWecomTagTree() {
return request({
url: '/system/tagInfo/tagTree',

2
flossom-ui/src/views/system/companyTag/index.vue
Unescape Escape View File

@ -345,7 +345,7 @@ export default {
handleExport() {
this.download('system/tagInfo/export', {
...this.queryParams
}, `企微标签数据_${new Date().getTime()}.xlsx`)
}, `外部标签数据_${new Date().getTime()}.xlsx`)
}
}
};

6
flossom-ui/src/views/system/instrument/index.vue
Unescape Escape View File

@ -143,7 +143,7 @@
</template>
</el-table-column>
<el-table-column
label="企微标签"
label="外部标签"
align="center"
prop="wecomTagNames"
width="150px"
@ -1698,7 +1698,7 @@ export default {
},
/* 设置企微可见标签 */
editWecomTags(row) {
// 企微标签树
// 外部标签树
getWecomTagTree().then((response) => {
this.wecomTag.optionTree = response.data
this.wecomTag.visible = true
@ -1718,7 +1718,7 @@ export default {
this.getList()
})
},
/* 保存企微标签 */
/* 保存外部标签 */
submitWecomTagList() {
this.form.id = this.wecomTag.userId
this.form.wecomTagIds = this.wecomTag.selectTagList.join(',')

22
flossom-ui/src/views/system/member/index.vue
Unescape Escape View File

@ -139,8 +139,8 @@
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-popover placement="top-start" width="200" trigger="click"
content="企微标签和小程序标签，同时满足所选内容">
<el-form-item label="企微标签" prop="wecomTags" slot="reference">
content="外部标签和小程序标签，同时满足所选内容">
<el-form-item label="外部标签" prop="wecomTags" slot="reference">
<el-select v-model="queryParams.wecomTags" multiple placeholder="请选择">
<el-option
v-for="item in wecomTags"
@ -152,7 +152,7 @@
</el-form-item>
</el-popover>
<el-popover placement="top-start" width="200" trigger="click"
content="企微标签和小程序标签，同时满足所选内容">
content="外部标签和小程序标签，同时满足所选内容">
<el-form-item label="小程序标签" prop="miniProgramTags" slot="reference">
<el-select v-model="queryParams.miniProgramTags" multiple placeholder="请选择">
<el-option
@ -236,7 +236,7 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="企微标签" align="center" prop="wecomTags" width="150px">
<el-table-column label="外部标签" align="center" prop="wecomTags" width="150px">
<template slot-scope="scope">
<el-tag v-for="item in scope.row.wecomTags" :key="item.id">
{{ item.tagName }}
@ -385,9 +385,9 @@
<treeselect v-model="form.miniProgramTags" :options="miniProgramTagTree" :multiple="true" :show-count="true"
placeholder="请选择小程序标签" :disable-branch-nodes="true"/>
</el-form-item>
<el-form-item label="企微标签" prop="tagIdArray" style="width: 80%">
<el-form-item label="外部标签" prop="tagIdArray" style="width: 80%">
<treeselect v-model="form.wecomTags" :options="wecomTagTree" :multiple="true" :show-count="true"
placeholder="请选择企微标签" :disable-branch-nodes="true"/>
placeholder="请选择外部标签" :disable-branch-nodes="true"/>
</el-form-item>
<el-form-item label="注册时间" prop="createTime">
<el-date-picker v-model="form.createTime" readonly disabled type="date" value-format="yyyy-MM-dd"/>
@ -703,7 +703,7 @@
<el-form-item label="小程序标签 " prop="miniProgramTags">
<el-switch v-model="exportFieldList.miniProgramTags" active-value="miniProgramTags" :inactive-value="null"/>
</el-form-item>
<el-form-item label="企微标签 " prop="wecomTags">
<el-form-item label="外部标签 " prop="wecomTags">
<el-switch v-model="exportFieldList.wecomTags" active-value="wecomTags" :inactive-value="null"/>
</el-form-item>
<el-form-item label="积分 " prop="credit">
@ -795,7 +795,7 @@ export default {
miniProgramTags: [],
// 小程序标签树
miniProgramTagTree: [],
// 企微标签树
// 外部标签树
wecomTagTree: [],
// 查询条件，企微二级标签
wecomTags: [],
@ -936,7 +936,7 @@ export default {
status: null,
// createTime: [],
devicesName: [], //仪器绑定
wecomTags: [], // 企微标签
wecomTags: [], // 外部标签
miniProgramTags: [], // 小程序标签
purchaseChannels: [], // 购买渠道
isCompleteInformation: null, // 用户信息是否完善
@ -1069,7 +1069,7 @@ export default {
getMiniProgramTagsTree().then(Response => {
this.miniProgramTagTree = Response.data
})
// 企微标签树
// 外部标签树
tagTreeSelect({type: 2}).then(response => {
this.wecomTagTree = response.data;
});
@ -1360,7 +1360,7 @@ export default {
status: null,
// createTime: [],
devicesName: [], //仪器绑定
wecomTags: [], // 企微标签
wecomTags: [], // 外部标签
miniProgramTags: [], // 小程序标签
purchaseChannels: [], // 购买渠道
isCompleteInformation: null, // 用户信息是否完善

6
flossom-ui/src/views/system/mode/index.vue
Unescape Escape View File

@ -168,7 +168,7 @@
</template>
</el-table-column>
<el-table-column label="解锁小程序标签" align="center" prop="lockWechatTag" />
<el-table-column label="解锁企微标签" align="center" prop="lockCompanyTag" />
<el-table-column label="解锁外部标签" align="center" prop="lockCompanyTag" />
<el-table-column label="备注 " align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@ -246,8 +246,8 @@
<el-form-item label="解锁小程序标签" prop="showWechatTagId" label-width="120px">
<treeselect v-model="form.lockWechatTagArray" :options="chatTagOptions" :multiple="true" :show-count="true" placeholder="请选择小程序标签" :disable-branch-nodes="true" />
</el-form-item>
<el-form-item label="解锁企微标签" prop="showCompanyTagId" label-width="120px">
<treeselect v-model="form.lockCompanyTagArray" :options="tagOptions" :multiple="true" :show-count="true" placeholder="请选择企微标签" :disable-branch-nodes="true" />
<el-form-item label="解锁外部标签" prop="showCompanyTagId" label-width="120px">
<treeselect v-model="form.lockCompanyTagArray" :options="tagOptions" :multiple="true" :show-count="true" placeholder="请选择外部标签" :disable-branch-nodes="true" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" maxlength="50"></el-input>

10
flossom-ui/src/views/system/scriptTag/index.vue
Unescape Escape View File

@ -62,11 +62,11 @@
<!-- <el-table-column label="类型" align="center" prop="tagType" >-->
<!-- <template slot-scope="scope">-->
<!-- <span v-show="scope.row.tagType == 1">小程序标签</span>-->
<!-- <span v-show="scope.row.tagType == 2">企微标签</span>-->
<!-- <span v-show="scope.row.tagType == 2">外部标签</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="tagNames" label="小程序标签" width="260"></el-table-column>
<el-table-column prop="companyTagNames" label="企微标签标签" width="260"></el-table-column>
<el-table-column prop="companyTagNames" label="外部标签标签" width="260"></el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="200">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
@ -129,7 +129,7 @@
<!-- <el-form-item label="标签类型" prop="tagType">-->
<!-- <el-select v-model="form.tagType" >-->
<!-- <el-option label="小程序标签" :value="1" :key="1"></el-option>-->
<!-- <el-option label="企微标签" :value="2" :key="2"></el-option>-->
<!-- <el-option label="外部标签" :value="2" :key="2"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
@ -139,8 +139,8 @@
</el-form-item>
</el-col>
<el-col :span="24" v-if="!topAdd">
<el-form-item label="企微标签" prop="companyIdArray" >
<treeselect v-model="form.companyIdArray" :options="tagOptions" :multiple="true" :show-count="true" placeholder="请选择企微标签" :disable-branch-nodes="true" />
<el-form-item label="外部标签" prop="companyIdArray" >
<treeselect v-model="form.companyIdArray" :options="tagOptions" :multiple="true" :show-count="true" placeholder="请选择外部标签" :disable-branch-nodes="true" />
</el-form-item>
</el-col>
<el-col :span="24" v-if="!topAdd">

12
flossom-ui/src/views/system/siteCarouselInfo/index.vue
Unescape Escape View File

@ -280,14 +280,14 @@
<el-form-item label="可见小程序标签" prop="showWechatTagId" label-width="120px">
<treeselect v-model="form.showWechatTagArray" :options="chatTagOptions" :multiple="true" :show-count="true" placeholder="请选择小程序标签" :disable-branch-nodes="true" />
</el-form-item>
<el-form-item label="可见企微标签" prop="showCompanyTagId" label-width="120px">
<treeselect v-model="form.showCompanyTagArray" :options="tagOptions" :multiple="true" :show-count="true" placeholder="请选择企微标签" :disable-branch-nodes="true" />
<el-form-item label="可见外部标签" prop="showCompanyTagId" label-width="120px">
<treeselect v-model="form.showCompanyTagArray" :options="tagOptions" :multiple="true" :show-count="true" placeholder="请选择外部标签" :disable-branch-nodes="true" />
</el-form-item>
<el-form-item label="禁止小程序标签" prop="forbidWechatTagId" label-width="120px">
<treeselect v-model="form.forbidWechatTagArray" :options="chatTagOptions" :multiple="true" :show-count="true" placeholder="请选择小程序标签" :disable-branch-nodes="true" />
</el-form-item>
<el-form-item label="禁止企微标签" prop="forbidCompanyTagId" label-width="120px">
<treeselect v-model="form.forbidCompanyTagArray" :options="tagOptions" :multiple="true" :show-count="true" placeholder="请选择企微标签" :disable-branch-nodes="true" />
<el-form-item label="禁止外部标签" prop="forbidCompanyTagId" label-width="120px">
<treeselect v-model="form.forbidCompanyTagArray" :options="tagOptions" :multiple="true" :show-count="true" placeholder="请选择外部标签" :disable-branch-nodes="true" />
</el-form-item>
<el-row>
<!-- <el-col :span = "12">-->
@ -337,8 +337,8 @@
<el-form-item label="点击弹窗获得小程序标签" prop="handlerWechatTagId" label-width="180px">
<treeselect v-model="form.handlerWechatTagArray" :options="chatTagOptions" :multiple="true" :show-count="true" placeholder="请选择小程序标签" :disable-branch-nodes="true" />
</el-form-item>
<el-form-item label="点击弹窗获得企微标签" prop="handlerCompanyTagId" label-width="180px">
<treeselect v-model="form.handlerCompanyTagArray" :options="tagOptions" :multiple="true" :show-count="true" placeholder="请选择企微标签" :disable-branch-nodes="true" />
<el-form-item label="点击弹窗获得外部标签" prop="handlerCompanyTagId" label-width="180px">
<treeselect v-model="form.handlerCompanyTagArray" :options="tagOptions" :multiple="true" :show-count="true" placeholder="请选择外部标签" :disable-branch-nodes="true" />
</el-form-item>
<el-form-item label="打卡显示活动 " prop="signNumber" label-width="120px">
<el-input v-model="form.signNumber" placeholder="请输入打卡多少次显示活动 " />

8
flossom-ui/src/views/system/siteInfo/index.vue
Unescape Escape View File

@ -286,14 +286,14 @@
<el-form-item label="可见小程序标签" prop="showWechatTagId" label-width="120px">
<treeselect v-model="form.showWechatTagArray" :options="chatTagOptions" :multiple="true" :show-count="true" placeholder="请选择小程序标签" :disable-branch-nodes="true" />
</el-form-item>
<el-form-item label="可见企微标签" prop="showCompanyTagId" label-width="120px">
<treeselect v-model="form.showCompanyTagArray" :options="tagOptions" :multiple="true" :show-count="true" placeholder="请选择企微标签" :disable-branch-nodes="true" />
<el-form-item label="可见外部标签" prop="showCompanyTagId" label-width="120px">
<treeselect v-model="form.showCompanyTagArray" :options="tagOptions" :multiple="true" :show-count="true" placeholder="请选择外部标签" :disable-branch-nodes="true" />
</el-form-item>
<el-form-item label="禁止小程序标签" prop="forbidWechatTagId" label-width="120px">
<treeselect v-model="form.forbidWechatTagArray" :options="chatTagOptions" :multiple="true" :show-count="true" placeholder="请选择小程序标签" :disable-branch-nodes="true" />
</el-form-item>
<el-form-item label="禁止企微标签" prop="forbidCompanyTagId" label-width="120px">
<treeselect v-model="form.forbidCompanyTagArray" :options="tagOptions" :multiple="true" :show-count="true" placeholder="请选择企微标签" :disable-branch-nodes="true" />
<el-form-item label="禁止外部标签" prop="forbidCompanyTagId" label-width="120px">
<treeselect v-model="form.forbidCompanyTagArray" :options="tagOptions" :multiple="true" :show-count="true" placeholder="请选择外部标签" :disable-branch-nodes="true" />
</el-form-item>
<el-row>
<!-- <el-col :span = "12">-->

Write Preview
Loading…
Cancel
Save