jiangjiazhi / center

Download as
Browse Code »

Commit 1af584a794067e6105c3f6f65c2c5c5eed8b14e3

Authored by fangcheng
2 parents cbc16ecb75 a7ffb0b99e
Exists in master

Merge remote-tracking branch 'origin/master'

Showing 5 changed files

parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentMessageTemplateController.java View file @ 1af584a
... ... @@ -63,7 +63,6 @@
63 63 temp.setModifyTime(new Date());
64 64 }
65 65 boolean tag = messageTemplateService.updateBatchById(template);
66   -
67 66 return handleAjaxResult(ajaxResult, tag, OperationName.DELETE);
68 67 }
69 68  
parent/center.manager/src/main/java/com/lyms/cm/controller/content/OrganizMessageController.java View file @ 1af584a
  1 +package com.lyms.cm.controller.content;
  2 +
  3 +import com.lyms.web.controller.BaseController;
  4 +import org.springframework.stereotype.Controller;
  5 +import org.springframework.web.bind.annotation.RequestMapping;
  6 +
  7 +/**
  8 + * @auther yangfei
  9 + * @createTime 2017Äê05ÔÂ27ÈÕ 16ʱ38·Ö
  10 + * @discription
  11 + */
  12 +@Controller
  13 +@RequestMapping("/organizMessage")
  14 +public class OrganizMessageController extends BaseController {
  15 +
  16 + @RequestMapping("/toList")
  17 + public String toOrgan() {
  18 + return "/content/org_list";
  19 + }
  20 +}
parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysOrganizationsController.java View file @ 1af584a
1 1 package com.lyms.cm.controller.sys;
2 2  
3   -import java.util.Map;
4   -
  3 +import com.baomidou.mybatisplus.mapper.EntityWrapper;
  4 +import com.baomidou.mybatisplus.plugins.Page;
  5 +import com.lyms.base.common.entity.organ.Organizations;
  6 +import com.lyms.base.common.service.organ.OrganizationsService;
  7 +import com.lyms.constants.OperationName;
  8 +import com.lyms.util.StrUtils;
  9 +import com.lyms.web.bean.AjaxResult;
  10 +import com.lyms.web.controller.BaseController;
5 11 import org.apache.commons.lang3.StringUtils;
6 12 import org.springframework.beans.factory.annotation.Autowired;
7 13 import org.springframework.stereotype.Controller;
... ... @@ -11,15 +17,7 @@
11 17 import org.springframework.web.bind.annotation.RequestMethod;
12 18 import org.springframework.web.bind.annotation.ResponseBody;
13 19  
14   -import com.baomidou.mybatisplus.mapper.EntityWrapper;
15   -import com.baomidou.mybatisplus.plugins.Page;
16   -import com.lyms.base.common.entity.organ.OrganGroup;
17   -import com.lyms.base.common.entity.organ.Organizations;
18   -import com.lyms.base.common.service.organ.OrganizationsService;
19   -import com.lyms.constants.OperationName;
20   -import com.lyms.util.StrUtils;
21   -import com.lyms.web.bean.AjaxResult;
22   -import com.lyms.web.controller.BaseController;
  20 +import java.util.Map;
23 21  
24 22 /**
25 23 * <p>
... ... @@ -47,6 +45,18 @@
47 45 @RequestMapping("/toList")
48 46 public String toOrgan() {
49 47 return "/organ/org_list";
  48 + }
  49 + /**
  50 + * <li>@Description:跳转到机构列表页
  51 + * <li>@return
  52 + * <li>创建人：maliang
  53 + * <li>创建时间：2017年3月8日
  54 + * <li>修改人：
  55 + * <li>修改时间：
  56 + */
  57 + @RequestMapping("/toOrgOperate")
  58 + public String toOrgOperate() {
  59 + return "/content/org_operate";
50 60 }
51 61  
52 62 /**
parent/center.manager/src/main/webapp/WEB-INF/views/content/org_list.html View file @ 1af584a
  1 +#override("body")
  2 +<div class="row wrapper border-bottom white-bg page-heading">
  3 + <div class="col-sm-10">
  4 + <div style="padding-top:30px;">
  5 + <form role="form" class="form-inline">
  6 + <!--
  7 + <div class="form-group" id="leve">
  8 + <span class="form-control">所属区域</span>
  9 + #extends("/organ/org.html")
  10 + </div>
  11 + -->
  12 + <div class="form-group">
  13 + <input type="text" placeholder="请输入医院名" id="usernameSearch" class="form-control">
  14 + </div>
  15 + <!-- <div class="form-group">
  16 + <input type="text" placeholder="请输入ID" id="idSearch" class="form-control">
  17 + </div> -->
  18 + </form>
  19 + </div>
  20 + </div>
  21 + <div class="col-sm-2">
  22 + <div class="title-action">
  23 + <a class="btn btn-primary"><i class="fa fa-search"></i> 查询</a>
  24 + </div>
  25 + </div>
  26 +</div>
  27 +<div class="wrapper wrapper-content">
  28 + <div class="row">
  29 + <div class="col-sm-12">
  30 +
  31 + <table id="dataTable"></table>
  32 + </div>
  33 + </div>
  34 +</div>
  35 +#end
  36 +#override("js")
  37 +<script type="text/javascript">
  38 +
  39 + var controllerRequestMappint = "/sysOrganizations/";
  40 +
  41 + var default_dataUrl = APP.PATH + controllerRequestMappint + "list";
  42 + var default_dataColumns = [{
  43 + field: 'check_state',
  44 + title: '',
  45 + checkbox: true
  46 + }, {
  47 + field: 'name',
  48 + title: '名称',
  49 + width: '20%'
  50 + }, {
  51 + field: 'address',
  52 + title: '地址',
  53 + width: '20%'
  54 + }, {
  55 + field: 'id',
  56 + title: '操作',
  57 + width: '50%',
  58 + formatter: function (value, row, index) {
  59 + return "<button class='btn btn-sm btn-success m-r-xs' onclick=allotContent('" + value + "')>配置短信版本</button>"
  60 + }
  61 + }];
  62 +
  63 +</script>
  64 +#end
  65 +#extends("/common/base_list.html")
  66 +<script src="${ctx}/static/js/area.js"></script>
  67 +<script type="text/javascript">
  68 + function allotContent(id) {
  69 + fullWindow("功能", APP.PATH + controllerRequestMappint + "/toOrgOperate");
  70 + }
  71 + //初始信息
  72 + get("", function (data) {
  73 + handler(data, "leve0");
  74 + //填充选择信息
  75 + });
  76 +</script>
parent/center.manager/src/main/webapp/WEB-INF/views/content/org_operate.html View file @ 1af584a
  1 +#override("body")
  2 +<div class="wrapper wrapper-content">
  3 + <div class="panel panel-default">
  4 + <div class="panel-body">
  5 + <h2>医院名称</h2>
  6 + </div>
  7 + </div>
  8 + <div class="row">
  9 + <div class="col-sm-3">
  10 + <div class="ibox float-e-margins">
  11 + <div class="ibox-content mailbox-content">
  12 + <div class="container-fluid">
  13 + <ul class="list-group col-sm-12">
  14 + <li onclick='showMessageList()' class='list-group-item col-sm-9'>医院介绍</li>
  15 + <li onclick='showMessageList()' class='list-group-item col-sm-9'>科室介绍</li>
  16 + <li onclick='showMessageList()' class='list-group-item col-sm-9'>医生介绍</li>
  17 + <li onclick='showMessageList()' class='list-group-item col-sm-9'>检查项目</li>
  18 + <li onclick='showMessageList()' class='list-group-item col-sm-9'>孕期产检</li>
  19 + <li onclick='showMessageList()' class='list-group-item col-sm-9'>儿童保健</li>
  20 + <li onclick='showMessageList()' class='list-group-item col-sm-9'>孕妇学校</li>
  21 + <li onclick='showMessageList()' class='list-group-item col-sm-9'>床位预约</li>
  22 + <li onclick='showMessageList()' class='list-group-item col-sm-9'>短信内容设置</li>
  23 + </ul>
  24 + <div class="clearfix"></div>
  25 + </div>
  26 + </div>
  27 + </div>
  28 + </div>
  29 + <div class="col-sm-9 animated fadeInRight">
  30 + <div class="panel panel-default">
  31 + <div class="panel-body">
  32 + <label>版本：</label><label id="version">加载中</label><label style="margin-left: 80px;">
  33 + <!-- 当前状态：</label><label id="status">未更改</label> -->
  34 + <input type="hidden" value="" id="verId">
  35 + </div>
  36 + </div>
  37 +
  38 + <div class="ibox float-e-margins">
  39 + <div class="row wrapper border-bottom white-bg page-heading">
  40 + <div class="col-sm-10">
  41 + <div style="padding-top:30px;">
  42 + <form role="form" class="form-inline">
  43 + <div class="form-group">
  44 + <label for="msgContent">短信内容：</label>
  45 + <input type="text" class="form-control" id="msgContent" placeholder="短信内容">
  46 + </div>
  47 + <div class="form-group" style="margin-left: 20px;display: none;">
  48 + <label>标签:</label>
  49 + <select class="form-control m-b" id="searchTags" style="margin-bottom: 0;">
  50 + </select>
  51 + </div>
  52 +
  53 + </form>
  54 + </div>
  55 + </div>
  56 + <div class="col-sm-2">
  57 + <div class="title-action" onclick="search();">
  58 + <a class="btn btn-primary"><i class="fa fa-search"></i> 查询</a>
  59 + </div>
  60 + </div>
  61 + </div>
  62 + <div class="wrapper wrapper-content">
  63 + <div class="row">
  64 + <div class="col-sm-12">
  65 + <div id="toolbar">
  66 + <button class="btn btn-info " type="button" onclick="add();"><i class="fa fa-plus"></i>
  67 + 新增
  68 + </button>
  69 + <!--<button class="btn btn-info " type="button" onclick="edit();"><i class="fa fa-paste"></i> 编辑</button>-->
  70 + <button class="btn btn-info " type="button" onclick="del();"><i class="fa fa-trash"></i>
  71 + 删除
  72 + </button>
  73 + </div>
  74 + <table id="dataTable"></table>
  75 + </div>
  76 + </div>
  77 + </div>
  78 +
  79 + </div>
  80 + </div>
  81 + #end
  82 + #extends("/common/base_list.html")