Merge branch 'master' of shine/esb_chenweifeng into master

Hos-resource/src/main/java/com/yihu/ehr/system/controller/DictController.java

@@ -54,7 +54,7 @@ public class DictController {
    }
    @RequestMapping("/dictItemDialog")
    public String resourceRestDetailDialog(Model model, String id, String mode) {
    public String resourceRestDetailDialog(Model model, String id, String mode,String dictName) {
        SystemDict sd=null;
        try {
            if ("view".equals(mode)) {
@@ -63,6 +63,9 @@ public class DictController {
                sd = dictManager.getSystemDictById(id);
            } else {
                sd= new SystemDict();
               // sd.setCode(chineseName);
                sd.setDictName(dictName);
            }
            model.addAttribute("resourceId", id);
            model.addAttribute("mode", mode);
@@ -83,7 +86,7 @@ public class DictController {
        try {
            Map<String, Object> params = new HashMap<>();
            String name = request.getParameter("name");
            //params.put("name", name);
            params.put("name", name);
            String page = StringUtils.isEmpty(request.getParameter("page")) ? "1" : request.getParameter("page");
            String rows = StringUtils.isEmpty(request.getParameter("rows")) ? "10" : request.getParameter("rows");
@@ -151,7 +154,7 @@ public class DictController {
            Map<String, Object> params = new HashMap<>();
            String name = request.getParameter("name");
            String dictId = request.getParameter("dictId");
           // params.put("name", name);
            params.put("name", name);
            String page = StringUtils.isEmpty(request.getParameter("page")) ? "1" : request.getParameter("page");
            String rows = StringUtils.isEmpty(request.getParameter("rows")) ? "10" : request.getParameter("rows");

Hos-resource/src/main/java/com/yihu/ehr/system/controller/UserController.java

@@ -15,9 +15,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.util.HashMap;
import java.util.Map;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
/**
 * 用户管理
 * Created by hzp on 2016/01/11.
@@ -81,8 +83,7 @@ public class UserController extends BaseController {
            model.addAttribute("contentPage", "system/user/editorUser");
            return "pageView";
        } catch (Exception ex) {
            model.addAttribute("contentPage", "system/user/editorUser");
            return "pageView";
            return "error";
        }
    }
@@ -153,7 +154,21 @@ public class UserController extends BaseController {
            return Result.error(ex.getMessage());
        }
    }
    /**
     * 修改密码界面
     */
    @RequestMapping("renewPassword")
    public String renewPassword(Model model) {
        try {
            model.addAttribute("model",null);
            model.addAttribute("contentPage", "system/user/changePassword");
            return "pageView";
        } catch (Exception ex) {
            return "error";
        }
    }
    /**
     * 修改密码
     */
@@ -161,18 +176,42 @@ public class UserController extends BaseController {
    @ResponseBody
    public Result changePassword(HttpServletRequest request) {
        try {
            String userid = request.getParameter("userid");
            String oldps = request.getParameter("oldps");
            String oldps1 = request.getParameter("oldps1");
            String newps = request.getParameter("newps");
            return userManager.changePassword(userid, newps);
            HttpSession session = request.getSession();
            String s="username";
            SystemUser user = (SystemUser) session.getAttribute("userInfo");
            String oldPassword = request.getParameter("oldPassword");
            MessageDigest md = MessageDigest.getInstance("MD5");
            byte[] bByte=md.digest(oldPassword.getBytes());
            StringBuffer sBuffer = new StringBuffer();
            String[] strDigits = { "0", "1", "2", "3", "4", "5",
                    "6", "7", "8", "9", "a", "b", "c", "d", "e", "f" };
            for (int i = 0; i < bByte.length; i++) {
                int iRet = bByte[i];
                if (iRet < 0) {
                    iRet += 256;
                }
                int iD1 = iRet / 16;
                int iD2 = iRet % 16;
                sBuffer.append(strDigits[iD1] + strDigits[iD2]);
            }
            if(!userManager.getUserByLoginCode(user.getLoginCode()).getPassword().equals(sBuffer.toString())){
                return Result.error("旧密码输入错误");
            }
            String newPassword = request.getParameter("newPassword");
            if(userManager.changePassword(userManager.getUserByLoginCode(user.getLoginCode()).getId(), newPassword)!=null)
               return Result.success("修改成功");
            else
                return Result.error("修改错误");
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
        }
    }
    /**
     * 修改密码
     * 删除用户
     */
    @RequestMapping("deleteUser")
    @ResponseBody

Hos-resource/src/main/java/com/yihu/ehr/system/dao/DictDao.java

@@ -19,7 +19,10 @@ public class DictDao extends SQLGeneralDAO implements IDictDao {
    public Result getDictList(Map<String, Object> params) throws Exception {
        StringBuilder sb = new StringBuilder(" from SystemDict s where 1=1 ");
        if (!StringUtils.isEmpty(params.get("dictId"))) {
            sb.append(" and  s.dictName = '" + params.get("dictId") + "' ");
            sb.append(" and  (s.dictName like '%" + params.get("dictId") +"%')");
        }
       else if (!StringUtils.isEmpty(params.get("name"))) {
            sb.append(" and  (s.code like '%" + params.get("name") + "%' or s.value like '%" + params.get("name")+"%')");
        }
        return super.getDataGridResult(sb.toString(), Integer.valueOf(params.get("page").toString()), Integer.valueOf(params.get("rows").toString()));

Hos-resource/src/main/java/com/yihu/ehr/system/dao/DictListDao.java

@@ -19,7 +19,7 @@ public class DictListDao extends SQLGeneralDAO implements IDictListDao {
    public Result getDictList(Map<String, Object> params) throws Exception {
        StringBuilder sb = new StringBuilder("from SystemDictList s where 1=1 ");
        if (!StringUtils.isEmpty(params.get("name"))) {
            sb.append(" and  s.dictName like '%" + params.get("name") + "%' ");
            sb.append(" and  s.chineseName like '%" + params.get("name") + "%' ");
        }
        sb.append(" order by dictName desc");
        return super.getDataGridResult(sb.toString(), Integer.valueOf(params.get("page").toString()), Integer.valueOf(params.get("rows").toString()));

Hos-resource/src/main/java/com/yihu/ehr/system/dao/SystemParamDao.java

@@ -19,7 +19,7 @@ public class SystemParamDao extends SQLGeneralDAO implements ISystemParamDao {
    public Result getParamList(Map<String, Object> params) throws Exception {
        StringBuilder sb = new StringBuilder("from SystemParam t where 1=1 ");
        if (!StringUtils.isEmpty(params.get("name"))) {
            sb.append(" and (t.key like '%" + params.get("name") + "%' or t.value like '%" + params.get("name") + "%')");
            sb.append(" and (t.paramKey like '%" + params.get("name") + "%' or t.paramValue like '%" + params.get("name") + "%')");
        }
        return super.getDataGridResult(sb.toString(), Integer.valueOf(params.get("page").toString()), Integer.valueOf(params.get("rows").toString()));
    }

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/common/indexJs.jsp

@@ -157,7 +157,16 @@
            });
            
            $('#btnIndexPassword').click(function(){
                $.ligerDialog.open({
                    height: 300,
                    width: 500,
                    title: "修改密码",
                    url: '${contextRoot}/user/renewPassword',
                });
            });
            //me.openHome();
            //打开默认菜单
            me.openMenuByText("任务跟踪");

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/configJobJs.jsp

@@ -47,6 +47,7 @@
            });
            $('#btnExecute').click(function(){
                //获取选择行
                debugger
                var row = me.grid.getSelectedRow();
                if(row!=null &&row.id!=undefined&&row.id.length>0)
                {

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/authority/authority.jsp

@@ -5,9 +5,9 @@
<!-- ####### 页面部分 ####### -->
<div class="m-content">
    <div id="div_wrapper">
        <div position="left" title="">
            <div class="l-text-wrapper m-form-control" style="margin-bottom: 24px;margin-top: 10px">
                <input type="text" id="div_wrapper_left_inp_search" placeholder="请输入角色名称"/>
        <div position="left" >
            <div  style="margin-bottom: 24px;margin-top: 10px;width: 100px">
                <input type="text" style="width: 100px" id="div_wrapper_left_inp_search" placeholder="请输入角色名称"/>
            </div>
            <div id="div_left_grid">

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/authority/authorityJs.jsp

@@ -4,6 +4,7 @@
    /* *************************** 模块初始化 ***************************** */
    var authority = {
        grid: null,
        $layout: $("#div_wrapper"),//布局对象
        $input: $("#div_wrapper_left_inp_search"),//搜索框对象
        $leftgrid: $("#div_left_grid"),//左边的datagrid
@@ -12,11 +13,14 @@
        $btnForbid: $("#div_forbid"),//全部禁止
        $rightgrid: null,//右边的datagrid
        currentRoleId: null,//选中的当前角色ID
        initOption: function () {
            $("#buttons").css("margin-left", window.screen.width / 3 - 150);
            this.initMenuGrid();
        },
        initMenuGrid: function () {
            authority.$rightgrid = $("#div_right_grid").ligerGrid({
                url: '${contextRoot}/authority/getMenuList',
                columns: [
@@ -55,6 +59,7 @@
                }
            });
        },
        change: function (id, type, flag) {
            var url = "";
@@ -95,7 +100,21 @@
            });
        },
        initleftGrid: function () {
            authority.$leftgrid = this.$leftgrid.ligerGrid({
            var me= this;
            $("#div_wrapper_left_inp_search").ligerSearch({
                width:180,
                onClick:function(value){
                    debugger
                    me.grid.set({
                        parms: {name:$('#div_wrapper_left_inp_search').val()}
                    });
                    me.grid.reload();
                }
            });
           me.grid= authority.$leftgrid = this.$leftgrid.ligerGrid({
                url: '${contextRoot}/role/getRoleList',
                columns: [
                    {display: '角色名称', id: 'name', name: 'name', width: '90%', align: "center"}
@@ -112,9 +131,12 @@
                    authority.currentRoleId = rowdata.id;
                    authority.$rightgrid.loadServerData({id: rowdata.id});
                }
            });
        },
        initlayout: function () {
            this.$layout.ligerLayout({
                height: "98%",
                leftWidth: 200,
@@ -127,11 +149,7 @@
            $("#div_wrapper .l-layout-top").css({"border": "0px"});
            $("#div_wrapper .l-layout-left .l-layout-header").hide();
            this.$input.ligerTextBox({
                width: 200, isSearch: true, onChangeValue: function (value) {
                }
            });
            this.$btnAllow.click(function () {
                if (!authority.currentRoleId) {
                    $.ligerDialog.error("请选择角色");
@@ -190,6 +208,7 @@
                    }
                });
            });
        },
        init: function () {
            this.initlayout();

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictItemDialogJs.jsp

@@ -18,12 +18,27 @@
            var me = this;
            this.$dictName.ligerComboBox({dict: true, dictName: "SYSTEM_DICT"});
           var data;
            var data;
            var modelString = "${model.id}";
            if(modelString!=undefined && modelString!=null && modelString.length>0)
            var modelDictString="${model.dictName}"
            if(modelDictString!=undefined && modelDictString!=null && modelDictString.length>0)
            {
                data={
                    id: "${model.id}",
                    dictName: "${model.dictName}",
                    code:"${model.code}",
                    value: "${model.value}",
                    pyCode: "${model.pyCode}",
                    sort: "${model.sort}"
                };
            }
           else  if(modelString!=undefined && modelString!=null && modelString.length>0)
            {
               data={
                    id: "${model.id}",
                    dictName: "${model.dictName}",
                    code:"${model.code}",
                    value: "${model.value}",

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictJs.jsp

@@ -4,6 +4,8 @@
    /* *************************** 模块初始化 ***************************** */
    var dict = {
        grid:null,
        grid1:null,
        $layout: $("#div_wrapper"),//layout对象
        $dictname: $("#dictname"),//字典输入框
        $dictItemName: $("#dictItemName"),//字典项输入框
@@ -80,6 +82,12 @@
            if (id != undefined && id != null) {
                title = "编辑字典项信息";
                params = {id: id,mode:"modify"};
            }
            else if(dict.grid.getSelectedRow()){
                var t=dict.grid.getSelectedRow();
                params = {dictName: t.dictName};
            }
            this.$dialog = $.ligerDialog.open({
@@ -119,14 +127,8 @@
            });
        },
        initButton: function () {
            this.$dictname.ligerTextBox({
                width: 200, isSearch: true, onChangeValue: function (value) {
                }
            });
            this.$dictItemName.ligerTextBox({
                width: 200, isSearch: true, onChangeValue: function (value) {
                }
            });
            this.$btnADDdict.click(function(){
                dict.editorResourceRestDialog();
            });
@@ -144,7 +146,27 @@
            this.$dialog.close();
        },
        initGrid: function () {
            dict.$dictGrid= this.$dictGrid.ligerGrid({
            var me=this;
            $("#dictname").ligerSearch({
                onClick:function(value){
                    me.grid.set({
                        parms: {name:$('#dictname').val()}
                    });
                    me.grid.reload();
                }});
            $("#dictItemName").ligerSearch({
                onClick:function(value){
                    me.grid1.set({
                        parms: {name:$('#dictItemName').val()}
                    });
                    me.grid1.reload();
                }});
            me.grid=dict.$dictGrid= this.$dictGrid.ligerGrid({
                url: '${contextRoot}/dict/getDictList',
                columns: [
                    {display: '字典名称', name: 'chineseName', width: '70%'},
@@ -172,7 +194,7 @@
                }
            });
            dict.$dictItemGrid=this.$dictItemGrid.ligerGrid({
            me.grid1=dict.$dictItemGrid=this.$dictItemGrid.ligerGrid({
                url: '${contextRoot}/dict/getDictItemList',
                columns: [
                    {display: '值域编码',  name: 'code', width: '40%', align: "center"},

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/menu/menu.jsp

@@ -9,16 +9,9 @@
        <div class="m-retrieve-area f-h50 f-dn f-pr m-form-inline">
            <div class="m-form-group f-mt10">
                <div class="m-form-control">
                    <div class="l-text">
                        <input type="text" id="txtName" class="l-text-field" placeholder="请输入代码或名称"/>
                    </div>
                </div>
                <div class="m-form-control f-ml20">
                    <!--按钮:查询 & 新增-->
                    <div id="btn_search" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                        <span><spring:message code="btn.search"/></span>
                    </div>
                </div>
                <div class="m-form-control m-form-control-fr" style="float: right">
                    <div id="div_new_record" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                        <span><spring:message code="btn.create"/></span>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/menu/menuJs.jsp

@@ -9,7 +9,10 @@
        init: function () {
            var me = this;
            $('.m-retrieve-area').show();
            $("#txtName").ligerSearch({
                onClick:function(value){
                me.reloadGrid();
            }});
            me.grid = $("#div_grid").ligerGrid({
                url: '${contextRoot}/menu/getMenuList',
                parms: {
@@ -64,9 +67,7 @@
        },
        bindEvents: function () {
            var me = this;
            $('#btn_search').click(function () {
                me.reloadGrid();
            });
            $('#div_new_record').click(function () {
                me.editorDialog();
            });

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/menuaction/menuAction.jsp

@@ -17,16 +17,11 @@
            <div class="m-retrieve-area f-h50 f-dn f-pr m-form-inline">
                <div class="m-form-group f-mt10">
                    <div class="m-form-control">
                        <div class="l-text">
                            <input type="text" id="txtName" class="l-text-field" placeholder="请输入名称"/>
                        </div>
                    </div>
                    <div class="m-form-control f-ml20">
                        <!--按钮:查询 & 新增-->
                        <div id="btn_search" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                            <span><spring:message code="btn.search"/></span>
                        </div>
                    </div>
                    <div class="m-form-control m-form-control-fr" style="float: right">
                        <div id="div_new_record" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                            <span><spring:message code="btn.create"/></span>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/menuaction/menuActionJs.jsp

@@ -10,7 +10,15 @@
            this.menuLeftInit();
            var me = this;
            $('.m-retrieve-area').show();
            $("#txtName").ligerSearch({
                onClick:function(value){
                    me.reloadGrid();
                }});
            $("#div_wrapper_left_inp_search").ligerSearch({
                width:180,
                onClick:function(value){
                    $.ligerui.get('menu_tree').queryByText(value);
                }});
            this.grid = $("#div_grid").ligerGrid({
                url: '${contextRoot}/menu/menuAction/getMenuActionList',
                columns: [
@@ -82,9 +90,7 @@
        },
        bindEvents: function () {
            var me = this;
            $('#btn_search').click(function () {
                me.reloadGrid();
            });
            $('#div_new_record').click(function () {
                me.editorDialog();
            });
@@ -156,12 +162,7 @@
            $("#div_wrapper .l-layout-top").css({"border": "0px"});
            $("#div_wrapper .l-layout-left .l-layout-header").hide();
            $searchBox = $("#div_wrapper_left_inp_search").ligerTextBox({
                width: 200, isSearch: true, onChangeValue: function (value) {
                    if (value != "" && value != null && value != undefined && value.length > 0)
                        $.ligerui.get('menu_tree').queryByText(value);
                }
            });
            $.ajax({
                type: "POST",
@@ -187,7 +188,7 @@
                        }
                    });
                    //修改样式
                    $("#menu_tree span").css({"line-height": "2", "font-weight": "normal"});
                   // $("#menu_tree span").css({"line-height": "2", "font-weight": "normal"});
                }
            });
        }

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/role/role.jsp

@@ -8,16 +8,11 @@
        <div class="m-retrieve-area f-h50 f-dn f-pr m-form-inline">
            <div class="m-form-group f-mt10">
                <div class="m-form-control">
                    <div class="l-text">
                        <input type="text" id="txtName" class="l-text-field" placeholder="请输入角色名称"/>
                    </div>
                </div>
                <div class="m-form-control f-ml20">
                    <!--按钮:查询 & 新增-->
                    <div id="btn_search" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                        <span><spring:message code="btn.search"/></span>
                    </div>
                </div>
                <div class="m-form-control m-form-control-fr" style="float: right">
                    <div id="div_new_record" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                        <span><spring:message code="btn.create"/></span>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/role/roleJs.jsp

@@ -9,7 +9,10 @@
        init: function () {
            var me = this;
            $('.m-retrieve-area').show();
            $("#txtName").ligerSearch({
                onClick:function(value){
                    me.reloadGrid();
                }});
            me.grid = $("#div_grid").ligerGrid({
                url: '${contextRoot}/role/getRoleList',
                parms: {
@@ -87,9 +90,7 @@
        },
        bindEvents: function () {
            var me = this;
            $('#btn_search').click(function () {
                me.reloadGrid();
            });
            $('#div_new_record').click(function () {
                me.editorDialog();
            });

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/systemparam/systemParam.jsp

@@ -9,16 +9,11 @@
    <div class="m-form-inline">
        <div class="m-form-group">
            <div class="m-form-control">
                <div class="l-text">
                    <input type="text" id="txtName" class="l-text-field" placeholder="请输入参数编码或者名称"/>
                </div>
            </div>
            <div class="m-form-control">
                <!--按钮:查询 & 新增-->
                <div id="btn_search" class="l-button">
                    <span><spring:message code="btn.search"/></span>
                </div>
            </div>
            <div class="m-form-control m-form-control-fr" style="float: right">
                <div id="div_new_record" class="l-button">
                    <span><spring:message code="btn.create"/></span>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/systemparam/systemParamJs.jsp

@@ -9,7 +9,10 @@
        init: function () {
            var me = this;
            $('.m-retrieve-area').show();
            $("#txtName").ligerSearch({
                onClick:function(value){
                    me.reloadGrid();
                }});
            me.grid = $("#div_grid").ligerGrid({
                url: '${contextRoot}/param/getParamList',
                parms: {
@@ -48,9 +51,7 @@
        },
        bindEvents: function () {
            var me = this;
            $('#btn_search').click(function () {
                me.reloadGrid();
            });
            $('#div_new_record').click(function () {
                me.editorDialog();
            });

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/changePassword.jsp

@@ -0,0 +1,47 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<!--修改密码-->
<div id="div_info_form" class="m-form-inline" style="padding-top:10px;" data-role-form>
  <div class="m-form-group">
    <label><span class="red">*&nbsp;</span>旧密码：</label>
    <div class="m-form-control ">
      <div class="l-text">
        <input type="password" class="l-text-field required"  name="oldPassword"/>
      </div>
    </div>
  </div>
  <div class="m-form-group">
    <label><span class="red">*&nbsp;</span>新密码：</label>
    <div class="m-form-control">
      <div class="l-text">
        <input type="password" class="l-text-field" id="newPassword" name="newPassword"/>
      </div>
    </div>
  </div>
  <div class="m-form-group">
    <label><span class="red">*&nbsp;</span>确认新密码：</label>
    <div class="m-form-control ">
      <div class="l-text">
        <input type="password" class="l-text-field" id="TwoNewPassword" name="TwoNewPassword">
      </div>
    </div>
  </div>
  <div  id="diff" align="center" style="display:none;">
    新密码不一致！
  </div>
  <div class="m-form-bottom">
    <div id="btnCancel" class="l-button l-button-no">
      <span>关闭</span>
    </div>
    <div id="btnSave" class="l-button">
      <span>提交</span>
    </div>
  </div>
</div>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/changePasswordJS.jsp

@@ -0,0 +1,79 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<script type="text/javascript">
  var changePassword = {
    //form
    actionUrl:"${contextRoot}/user/changePassword",
    init: function () {
      this.initForm();
      this.bindEvents();
    },
    initForm: function () {
      var data;
      $("#div_info_form").ligerAutoForm({
        data:data,
        validate:{
          oldPassword:"required",
          TwoNewPassword: "required",
          newPassword:"required",
        },
      });
    },
    bindEvents: function () {
      var me = this;
      $("#btnSave").click(function () {
        if(!$("#div_info_form").ligerAutoForm("validate")){
          return;
        }
        //alert(document.getElementsByName("newPassword"))
        //debugger
        if($("#newPassword").val()!=$("#TwoNewPassword").val())
        {
          debugger
          $("#diff").show();
        }
        var data = $("#div_info_form").ligerAutoForm("getData");
        $.ajax({ //ajax处理
          type: "POST",
          url : me.actionUrl,
          dataType : "json",
          data:data,
          cache:false,
          success :function(data){
            if(data.successFlg) {
              $.ligerDialog.success(data.message);
              parent.indexPage.dialogSuccess(data.message);
            }
            else{
              $.ligerDialog.error(data.message);
            }
          },
          error :function(data){
            $.ligerDialog.error("Status:"+data.status +"(" +data.statusText+")");
          }
        });
      });
      $("#btnCancel").click(function(){
        parent.$.ligerDialog.close();
        parent.$(".l-dialog,.l-window-mask").remove();
      });
    }
  };
  $(function () {
    changePassword.init();
  });
</script>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/editorUserJs.jsp

@@ -39,8 +39,7 @@
                data:data,
                validate:{
                    loginCode:"required",
                    password:"required",
                    passwordTwo:"required",
                },
                message:{
@@ -53,6 +52,7 @@
            var me = this;
            $("#btnSave").click(function () {
                if (!$("#div_info_form").ligerAutoForm("validate")) {
                    debugger
                    return;
                }
                var data = $("#div_info_form").ligerAutoForm("getData");

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/user.jsp

@@ -9,16 +9,11 @@
        <div class="m-retrieve-area f-h50 f-dn f-pr m-form-inline">
            <div class="m-form-group f-mt10">
                <div class="m-form-control">
                    <div class="l-text">
                        <input type="text" id="txtName" class="l-text-field" placeholder="请输入角色名称"/>
                    </div>
                </div>
                <div class="m-form-control f-ml20">
                    <!--按钮:查询 & 新增-->
                    <div id="btn_search" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                        <span><spring:message code="btn.search"/></span>
                    </div>
                </div>
                <div class="m-form-control m-form-control-fr" style="float: right">
                    <div id="div_new_record" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                        <span><spring:message code="btn.create"/></span>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/userJs.jsp

@@ -9,7 +9,10 @@
        init: function () {
            var me = this;
            $('.m-retrieve-area').show();
            $("#txtName").ligerSearch({
                onClick:function(value){
                    me.reloadGrid();
                }});
            me.grid = $("#div_grid").ligerGrid({
                url: '${contextRoot}/user/getUserList',
                parms: {
@@ -132,9 +135,7 @@
        },
        bindEvents: function () {
            var me = this;
            $('#btn_search').click(function () {
                me.reloadGrid();
            });
            $('#div_new_record').click(function () {
                me.editorDialog();
            });