diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentMessageTemplateMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentMessageTemplateMapper.xml index 8c6c842..6c1f32f 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentMessageTemplateMapper.xml +++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentMessageTemplateMapper.xml @@ -27,7 +27,7 @@ diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentTagsMapper.java b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentTagsMapper.java index a1613ed..6622efa 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentTagsMapper.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentTagsMapper.java @@ -19,8 +19,7 @@ import java.util.List; */ @Repository public interface ContentTagsMapper extends BaseMapper { - - public Integer deleteLogicById(Serializable id); - + public Integer deleteLogicById(Serializable id); public List getTags(Page page, @Param("name") String name); + public List getTags(); } \ No newline at end of file diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentTagsMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentTagsMapper.xml index 9ea36c3..94a3906 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentTagsMapper.xml +++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentTagsMapper.xml @@ -25,11 +25,12 @@ diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/content/ContentMessageTemplate.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/content/ContentMessageTemplate.java index 7122ffc..3d3a8d7 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/entity/content/ContentMessageTemplate.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/content/ContentMessageTemplate.java @@ -38,7 +38,8 @@ public class ContentMessageTemplate implements Serializable { /** * 是否图文 */ - private String isRich; + @TableField(value="IS_RICH") + private int isRich; /** * 富文本标题 */ @@ -143,11 +144,11 @@ public class ContentMessageTemplate implements Serializable { this.keyCode = keyCode; } - public String getIsRich() { + public int getIsRich() { return isRich; } - public void setIsRich(String isRich) { + public void setIsRich(int isRich) { this.isRich = isRich; } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/content/ContentTags.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/content/ContentTags.java index d93a16a..daad097 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/entity/content/ContentTags.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/content/ContentTags.java @@ -86,6 +86,24 @@ public class ContentTags implements Serializable { @TableField(value="ENABLE") private Integer enable; + @Override + public String toString() { + return "ContentTags{" + + "id='" + id + '\'' + + ", tagName='" + tagName + '\'' + + ", tagDesc='" + tagDesc + '\'' + + ", level=" + level + + ", perentId='" + perentId + '\'' + + ", createTime=" + createTime + + ", createId='" + createId + '\'' + + ", createName='" + createName + '\'' + + ", modifyId='" + modifyId + '\'' + + ", modifyName='" + modifyName + '\'' + + ", modifyTime=" + modifyTime + + ", ifdel=" + ifdel + + ", enable=" + enable + + '}'; + } public String getId() { return id; diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentMessageTemplateService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentMessageTemplateService.java index ac608e9..e03c2fb 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentMessageTemplateService.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentMessageTemplateService.java @@ -27,7 +27,7 @@ public interface ContentMessageTemplateService extends BaseService getContentMessageTemplate(Page page, MsgTempSerachDTO msgTemp); + public List getContentMessageTemplate(Page page, MsgTempSerachDTO msgTemp); public List getContentMessageTemplate(MsgTempSerachDTO msgTemp); diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentTagsService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentTagsService.java index 98a5321..545de78 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentTagsService.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentTagsService.java @@ -5,6 +5,7 @@ import com.lyms.base.common.entity.content.ContentTags; import com.lyms.web.service.BaseService; import java.io.Serializable; +import java.util.List; /** *

@@ -24,4 +25,6 @@ public interface ContentTagsService extends BaseService { public Integer deleteLogicById(Serializable id); public Page getTags(Page page, String name); + + public List getTags(); } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentMessageTemplateServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentMessageTemplateServiceImpl.java index 9397dbd..c460e2b 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentMessageTemplateServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentMessageTemplateServiceImpl.java @@ -28,10 +28,9 @@ public class ContentMessageTemplateServiceImpl extends ServiceImpl getContentMessageTemplate(Page page, MsgTempSerachDTO msgTemp) { + public List getContentMessageTemplate(Page page, MsgTempSerachDTO msgTemp) { List lists = baseMapper.getContentMessageTemplate(page, msgTemp); - page.setRecords(lists); - return page; + return lists; } @Override diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentTagsServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentTagsServiceImpl.java index 54bb3d4..fe59fa5 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentTagsServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentTagsServiceImpl.java @@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.lyms.base.common.dao.content.ContentTagsMapper; import com.lyms.base.common.entity.content.ContentTags; import com.lyms.base.common.service.content.ContentTagsService; +import com.lyms.util.StrUtils; import org.springframework.stereotype.Service; +import javax.annotation.PostConstruct; import java.io.Serializable; +import java.util.HashMap; import java.util.List; /** @@ -25,10 +28,44 @@ public class ContentTagsServiceImpl extends ServiceImpl tagsMap = new HashMap<>(); + + @PostConstruct + public void initData(){ + List tagsList = baseMapper.getTags(); + for(ContentTags conTag:tagsList){ + tagsMap.put(conTag.getId(),conTag.getTagName()); + } + } + + public static String getValue(String key){ + if(StrUtils.isEmpty(key)){ + return ""; + }else{ + return tagsMap.get(key); + } + } + + public static void setValue(String key,String value){ + tagsMap.put(key,value); + } + + public static void updateValues(List tagsList){ + for(ContentTags conTag:tagsList){ + tagsMap.put(conTag.getId(),conTag.getTagName()); + } + } + @Override public Page getTags(Page page, String name) { List lists = baseMapper.getTags(page, name); page.setRecords(lists); return page; } + + @Override + public List getTags() { + List lists = baseMapper.getTags(); + return lists; + } } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentTemplateVersionServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentTemplateVersionServiceImpl.java index 1115d96..9f0130c 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentTemplateVersionServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentTemplateVersionServiceImpl.java @@ -1,17 +1,15 @@ package com.lyms.base.common.service.content.impl; -import java.io.Serializable; -import java.util.Date; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.lyms.base.common.dao.content.ContentTemplateVersionMapper; import com.lyms.base.common.entity.content.ContentTemplateVersion; import com.lyms.base.common.service.content.ContentTemplateVersionService; import com.lyms.exception.SystemException; -import com.lyms.util.StrUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.io.Serializable; +import java.util.Date; /** *

@@ -33,7 +31,6 @@ public class ContentTemplateVersionServiceImpl extends ServiceImpl - * 消息模板内容 前端控制器 - *

- * - * @author yangfei - * @since 2017-04-14 - */ -@Controller -@RequestMapping("/contentMessageTemplate") -public class ContentMessageTemplateController extends BaseController { - //模板信息 - @Autowired - private ContentMessageTemplateService messageTemplateService; - //模板信息标签 - @Autowired - private ContentTemplateMessageTagsService messageTagsService; - /** - * 跳转到列表页面 - * - * @return - */ - @RequestMapping(value = "/toList", method = { RequestMethod.GET }) - public String toList() { - return "/content/template_list"; - } - - /** - * 跳转到编辑页面 - * - * @return - */ - @RequestMapping(value = { "/{verId}/toEdit" }, method = RequestMethod.GET) - public String toEdit(@PathVariable String verId, Model model) { - model.addAttribute("verId", verId); - return "/content/template_edit"; - } - - /** - * 获取消息内容列表 - * @param msgTemp - * @return - */ - @ResponseBody - @RequestMapping(value = "/list", method = { RequestMethod.GET, RequestMethod.POST }) - public Map list(MsgTempSerachDTO msgTemp) { - Page page = getPage(); - page = messageTemplateService.getContentMessageTemplate(page,msgTemp); - return toGridData(page); - } - - /** - * 新增消息模板信息 - *

- * TODO - * - * @return - */ - @RequestMapping(value = "/create", method = RequestMethod.POST) - @ResponseBody - public AjaxResult create(@ModelAttribute InContentMessageTemplateDTO contentMessage, AjaxResult ajaxResult) { - ContentMessageTemplate messTemp = new ContentMessageTemplate(); - messTemp.setId(StrUtils.uuid()); - messTemp.setCreateTime(new Date()); - messTemp.setEnable(0); - messTemp.setIfdel(0); - messTemp.setKeyCode(messTemp.getId()); - messTemp.setContent(contentMessage.getContent()); - messTemp.setRichTitle(contentMessage.getRichTitle()); - messTemp.setRichText(contentMessage.getRichText()); - messTemp.setTemplateVersionId(contentMessage.getTemplateVersionId()); - boolean tag = messageTemplateService.insert(messTemp); - return handleAjaxResult(ajaxResult, tag, OperationName.CREATE); - } - -} - +package com.lyms.cm.controller.content; + +import com.baomidou.mybatisplus.plugins.Page; +import com.lyms.base.common.entity.content.ContentMessageTemplate; +import com.lyms.base.common.entity.content.ContentTemplateMessageTags; +import com.lyms.base.common.service.content.ContentMessageTemplateService; +import com.lyms.base.common.service.content.ContentTemplateMessageTagsService; +import com.lyms.base.common.service.content.impl.ContentTagsServiceImpl; +import com.lyms.base.common.vo.content.ContentMessageTemplateDTO; +import com.lyms.base.common.vo.content.InContentMessageTemplateDTO; +import com.lyms.base.common.vo.content.MsgTempSerachDTO; +import com.lyms.constants.OperationName; +import com.lyms.util.StrUtils; +import com.lyms.web.bean.AjaxResult; +import com.lyms.web.controller.BaseController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + *

+ * 消息模板内容 前端控制器 + *

+ * + * @author yangfei + * @since 2017-04-14 + */ +@Controller +@RequestMapping("/contentMessageTemplate") +public class ContentMessageTemplateController extends BaseController { + //模板信息 + @Autowired + private ContentMessageTemplateService messageTemplateService; + //模板信息标签 + @Autowired + private ContentTemplateMessageTagsService messageTagsService; + /** + * 跳转到列表页面 + * + * @return + */ + @RequestMapping(value = "/toList", method = { RequestMethod.GET }) + public String toList() { + return "/content/template_list"; + } + + /** + * 跳转到编辑页面 + * + * @return + */ + @RequestMapping(value = { "/{verId}/toEdit" }, method = RequestMethod.GET) + public String toEdit(@PathVariable String verId,String id,String vName, Model model) { + model.addAttribute("verId", verId); + model.addAttribute("vName", vName); + model.addAttribute("id", id); + if(StrUtils.isNotEmpty(id)){//查询 + ContentMessageTemplate tempInfo = messageTemplateService.selectById(id); + model.addAttribute("tempInfo",tempInfo); + } + return "/content/template_edit"; + } + + /** + * 获取消息内容列表 + * @param msgTemp + * @return + */ + @ResponseBody + @RequestMapping(value = "/list", method = { RequestMethod.GET, RequestMethod.POST }) + public Map list(MsgTempSerachDTO msgTemp) { + Page page = getPage(); + List cmtdList = messageTemplateService.getContentMessageTemplate(page,msgTemp); + for(ContentMessageTemplateDTO ct : cmtdList){ + StringBuffer tagsBf = new StringBuffer(); + String[] contentTags = ct.getContentTagIds().split(","); + for(String s:contentTags){ + if(StrUtils.isEmpty(s)){ + continue; + } + tagsBf.append(ContentTagsServiceImpl.getValue(s)+","); + } + ct.setContentTagIds(tagsBf.substring(0,tagsBf.length()-1).toString()); + System.out.println("标签名：--------------->"+ct.getContentTagIds()); + } + + page.setRecords(cmtdList); + return toGridData(page); + } + + /** + * 新增消息模板信息 + *

+ * TODO + * + * @return + */ + @RequestMapping(value = "/create", method = RequestMethod.POST) + @ResponseBody + public AjaxResult create(@ModelAttribute InContentMessageTemplateDTO contentMessage, AjaxResult ajaxResult) { + ContentMessageTemplate messTemp = new ContentMessageTemplate(); + messTemp.setId(StrUtils.uuid()); + messTemp.setEnable(0); + messTemp.setIfdel(0); + messTemp.setCreateTime(new Date()); + messTemp.setKeyCode(messTemp.getId()); + messTemp.setContent(contentMessage.getContent()); + messTemp.setRichTitle(contentMessage.getRichTitle()); + messTemp.setRichText(contentMessage.getRichText()); + messTemp.setTemplateVersionId(contentMessage.getTemplateVersionId()); + messTemp.setIsRich(contentMessage.getIsRich()); + for(String tags : contentMessage.getContentTagIds()){ + ContentTemplateMessageTags ctmt = new ContentTemplateMessageTags(); + ctmt.setId(StrUtils.uuid()); + ctmt.setMessageTemplate(messTemp.getId()); + ctmt.setTagsIds(tags); + messageTagsService.insert(ctmt); + } + boolean tag = messageTemplateService.insert(messTemp); + return handleAjaxResult(ajaxResult, tag, OperationName.CREATE); + } + +} diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentTagsController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentTagsController.java index 95eff02..1535e18 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentTagsController.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentTagsController.java @@ -3,6 +3,7 @@ package com.lyms.cm.controller.content; import com.baomidou.mybatisplus.plugins.Page; import com.lyms.base.common.entity.content.ContentTags; import com.lyms.base.common.service.content.ContentTagsService; +import com.lyms.base.common.service.content.impl.ContentTagsServiceImpl; import com.lyms.base.common.vo.content.ContentTagsDTO; import com.lyms.constants.OperationName; import com.lyms.util.StrUtils; @@ -96,6 +97,9 @@ public class ContentTagsController extends BaseController { cts.setTagDesc(ctd.getTagDesc()); cts.setPerentId(ctd.getPerentId()); boolean tag = contentTagsService.insert(cts); + if(tag){ + ContentTagsServiceImpl.setValue(cts.getId(),cts.getTagName()); + } return handleAjaxResult(ajaxResult, tag, OperationName.CREATE); } diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentTemplateVersionController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentTemplateVersionController.java index 89c21c7..8bc2b0b 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentTemplateVersionController.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentTemplateVersionController.java @@ -2,8 +2,11 @@ package com.lyms.cm.controller.content; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; +import com.lyms.base.common.entity.content.ContentMessageTemplate; +import com.lyms.base.common.entity.content.ContentTemplateMessageTags; import com.lyms.base.common.entity.content.ContentTemplateVersion; import com.lyms.base.common.service.content.ContentMessageTemplateService; +import com.lyms.base.common.service.content.ContentTemplateMessageTagsService; import com.lyms.base.common.service.content.ContentTemplateVersionService; import com.lyms.base.common.vo.content.ContentMessageTemplateDTO; import com.lyms.base.common.vo.content.MsgTempSerachDTO; @@ -18,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.Date; import java.util.List; import java.util.Map; @@ -37,6 +41,9 @@ public class ContentTemplateVersionController extends BaseController { //模板信息 @Autowired private ContentMessageTemplateService messageTemplateService; + //模板信息标签 + @Autowired + private ContentTemplateMessageTagsService messageTagsService; /** * 列表 * @param model @@ -65,12 +72,42 @@ public class ContentTemplateVersionController extends BaseController { @RequestMapping(value = "/create", method = { RequestMethod.POST }) public AjaxResult create(ContentTemplateVersion templateVersion,String perId, AjaxResult ajaxResult) { boolean tag = false; + templateVersion.setId(StrUtils.uuid()); + if(StrUtils.isNotEmpty(perId)){//复制版本 MsgTempSerachDTO msgTemp = new MsgTempSerachDTO(); msgTemp.setVerId(perId); List messageList = messageTemplateService.getContentMessageTemplate(msgTemp); for(ContentMessageTemplateDTO ctd : messageList){ - System.out.println("tagsId:"+ctd.getContentTagIds()); + String[] tagIds = ctd.getContentTagIds().split(",,,"); + ContentMessageTemplate messTemp = new ContentMessageTemplate(); + messTemp.setId(StrUtils.uuid()); + messTemp.setCreateTime(new Date()); + messTemp.setKeyCode(ctd.getKeyCode()); + messTemp.setContent(ctd.getContent()); + messTemp.setRichTitle(ctd.getRichTitle()); + messTemp.setRichText(ctd.getRichText()); + messTemp.setIsRich(ctd.getIsRich()); + messTemp.setTemplateVersionId(templateVersion.getId()); + messTemp.setEnable(ctd.getEnable()); + messTemp.setIfdel(ctd.getIfdel()); + for(int i =0;i:" + tagId); + if(tagId.indexOf(",")!=0){ + tagId = ","+tagId; + } + if(tagId.lastIndexOf(",")!=tagId.length()-1){ + tagId = tagId+","; + } + ContentTemplateMessageTags ctmt = new ContentTemplateMessageTags(); + ctmt.setId(StrUtils.uuid()); + ctmt.setMessageTemplate(messTemp.getId()); + ctmt.setTagsIds(tagId); + messageTagsService.insert(ctmt); + System.out.println("tagsId后---------------->:" + tagId); + } + messageTemplateService.insert(messTemp); } } tag = templateVersionService.create(templateVersion); diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/content/template_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/content/template_edit.html index ab19e7e..560da64 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/content/template_edit.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/content/template_edit.html @@ -7,42 +7,50 @@

+
+ +
+ + +
+
+
-
- +
+
-
+
-
+
-
+
+
@@ -96,8 +105,6 @@ data.data.forEach(function(d, i) { optionTagHtml += ''; }); - - //默认一个选择标签 addSeleTags(); } @@ -113,33 +120,49 @@ var ue = UE.getEditor('editor',{initialFrameHeight:200,initialFrameWidth:"100%" }); }); - $(function(){ - - setTimeout(function(){ + + $(function(){ + setTimeout(function(){ initTagsData(); },500); - + + if("$!id"!=""&&"$!tempInfo.isRich"==1){ + $("#imageTitle").toggleClass("hidden"); + $("#imageContext").toggleClass("hidden"); + $("#imageTitle").toggleClass("show"); + $("#imageContext").toggleClass("show"); + var ue = UE.getEditor('editor',{initialFrameHeight:200,initialFrameWidth:"100%" }); + ue.ready(function(){ + //设置编辑器的内容 + ue.setContent('$!tempInfo.richText'); + }); + + } }); - + function save(){ - var content = UE.getEditor('editor').getContent(); if($('#validForm').valid()){ - var data = $('#validForm').serialize(); - for(var i=1;i \ No newline at end of file diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/content/template_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/content/template_list.html index 1b68b1f..6d5008c 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/content/template_list.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/content/template_list.html @@ -80,6 +80,21 @@ }); } + function del(){ + + var seleions = $('#dataTable').bootstrapTable("getSelections",""); +// alert(JSON.stringify(seleions)); + layer.confirm('确定删除选中的短信吗？', { + btn: ['确定','取消'], //按钮 + shade: false //不显示遮罩 + }, function(){ + layer.msg('删除成功', {icon: 1}); + }, function(){ + layer.msg('取消删除', {shift: 6}); + }); + + } + function search(){ var msgContent = $("#msgContent").val(); var searchTags = $("#searchTags").val(); @@ -119,7 +134,8 @@ layer.msg('请先选择消息模板版本'); return; } - fullWindow("新增信息模板", APP.PATH + controllerRequestMappint + verId+"/toEdit"); + var vName = version.versionName; + popWindow("新增信息模板", APP.PATH + controllerRequestMappint + verId+"/toEdit?vName="+vName,850,800); } var templateVer = []; @@ -149,6 +165,12 @@ pageSize: 50, //每页的记录行数（*） pageList: [200], //可供选择的每页的行数（*） strictSearch: true, + onDblClickRow:function(row,ev){ + //alert(JSON.stringify(row)); +// var id = row.id; +// alert(id) + popWindow("修改信息模板", APP.PATH + controllerRequestMappint + version.id+"/toEdit?id="+row.id+"&vName="+version.versionName,850,800); + }, queryParams:{ verId:0 }, @@ -163,24 +185,50 @@ checkbox: true },{ field: 'id', - title: '序号', - visible: false - }, { + title: '', + visible:false + },{ field: 'content', title: '短信内容' + },{ + field:'contentTagIds', + title:'标签', + formatter:function(value,row,index){ + var tagsNames = value.split(","); + var tagsHtml = ""; + for(var i =0;i'; + }else if((i+1)%5==2){ + tagsHtml+=''+tagsNames[i]+''; + }else if((i+1)%5==3){ + tagsHtml+=''+tagsNames[i]+''; + }else if((i+1)%5==4){ + tagsHtml+=''+tagsNames[i]+''; + }else{ + tagsHtml+=''+tagsNames[i]+''; + } + } + return tagsHtml; + } }]}); } - function copyVer(ver){ + function copyVer(ver,name){ layer.open({ type: 1 //Page层类型 ,area: ['530px', '300px'] - ,title: '新增消息模板版本' + ,title: '复制消息模板版本' ,shade: 0.6 //遮罩透明度 ,maxmin: true //允许全屏最小化 ,anim: 2 //0-6的动画形式，-1不开启 - ,content: "
" + ,content: "
" + + "
" }); } @@ -198,7 +246,7 @@ if(data){ templateVer = data; data.forEach(function(i,d){ - versionHtml+="
  • "+i.versionName+"
    • "; + versionHtml+="
  • "+i.versionName+"
    • "; }); $("#temp_version").append(versionHtml); }