Merge branch 'master' of huangzhanpeng/esb_huangzhanpeng into master

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

@@ -17,50 +17,49 @@
    }
</style>
<!-- ####### 页面部分 ####### -->
<div class="m-content">
<div id="div_wrapper">
    <div id="overlay" class="zhezhao"></div>
    <div id="div_wrapper">
        <!--左边 区域-->
        <div position="left" title="">
            <div class="l-text-wrapper m-form-control" style="margin-bottom: 15px;margin-top: 10px">
                <input type="text" id="div_wrapper_left_inp_search" placeholder="请输入资源名称"/>
            </div>
            <ul id="ul_tree1" class="m-snav"></ul>
    <!--左边 区域-->
    <div position="left"  style="margin-left:10px;margin-top:10px;">
        <div class="m-form-control">
            <input type="text" id="div_wrapper_left_inp_search" placeholder="请输入资源名称"/>
        </div>
        <!--右边区域-->
        <div position="center" id="div_wrapper_right" title="">
            <!--右边上面区域-->
            <div position="top" id="div_wrapper_right_top" title="查询条件" class="div_wrapper_right_top">
                <div class="m-form-inline">
                    <div class="m-form-group">
                        <label>过滤条件：</label>
        <ul id="ul_tree1" class="m-snav"></ul>
    </div>
    <!--右边区域-->
    <div position="center" id="div_wrapper_right" style="margin-left:10px;margin-top:10px;margin-right:10px;">
        <!--右边上面区域-->
        <div position="top" id="div_wrapper_right_top" title="查询条件" class="div_wrapper_right_top">
            <div class="m-form-inline">
                <div class="m-form-group">
                    <label>过滤条件：</label>
                        <div class="m-form-control">
                            <input type="text" id="resourceCondition"/>
                        </div>
                    <div class="m-form-control">
                        <input type="text" id="resourceCondition"/>
                    </div>
                </div>
            </div>
            <!--右边下面中间区域-->
            <div position="center" title="" class="f-fwb m-snav">
                <div  style="height: 30px;margin-bottom: 2px">
                    <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 id="btn_select" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                        <span>导出选中结果</span>
                    </div>
                    <div id="btn_selectALL" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                        <span>导出查询结果</span>
        </div>
        <!--右边下面中间区域-->
        <div position="center" title="" class="f-fwb m-snav">
            <div  style="height: 40px;">
                <div class="m-form-control f-ml20">
                    <!--按钮:查询 & 新增-->
                    <div id="btn_search" class="l-button">
                        <span><spring:message code="btn.search"/></span>
                    </div>
                </div>
                <div id="div_wrapper_right_bottom_datagrid"></div>
                <div id="btn_select" class="l-button">
                    <span>导出选中结果</span>
                </div>
                <div id="btn_selectALL" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                    <span>导出查询结果</span>
                </div>
            </div>
            <div id="div_wrapper_right_bottom_datagrid"></div>
        </div>
    </div>
</div>
<script src="${staticRoot}/lib/jqueryfiledownload/jquery.fileDownload.js"></script>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourcebrowse/resourceJs.jsp

@@ -153,11 +153,8 @@
                headerRowHeight: 40,
                // 行的高度
                rowHeight: 40,
                height: "96%",
                //  isScroll:true,//是否滚动
                checkbox: true,//选择框
                // 编辑器位置误差调整
                editorTopDiff: 41,
                allowAdjustColWidth: true,
                onSuccess: function (msg) {
                    // resource.hideOverlay();

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/resourceBrowseCss.jsp

@@ -1,5 +0,0 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<style>
</style>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceManage.jsp

@@ -3,42 +3,39 @@
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<!-- ####### 页面部分 ####### -->
<div class="m-content">
    <div id="div_wrapper">
        <!--左边 区域-->
        <div position="left" title="">
            <div class="l-text-wrapper m-form-control" style="margin-bottom: 15px">
                <input type="text" id="div_wrapper_left_inp_search" placeholder="请输入分类名称"/>
            </div>
            <ul id="div_wrapper_left_ul_resourcetree" class="m-snav"></ul>
<div id="div_wrapper">
    <!--左边 区域-->
    <div position="left"  style="margin-left:10px;margin-top:10px;">
        <div class="m-form-control" style="margin-bottom: 15px">
            <input type="text" id="div_wrapper_left_inp_search" placeholder="请输入分类名称"/>
        </div>
        <div id="div_wrapper_right" position="center" title="">
            <!-- ####### 查询条件部分 ####### -->
            <div class="m-retrieve-area f-h50 f-dn f-pr m-form-inline" data-role-form>
                <div class="m-form-group f-mt10">
                    <div class="m-form-control">
                        <!--输入框-->
                        <input type="text" id="inp_search" placeholder="请输入资源名称" class="f-ml10"
                               data-attr-scan="searchNm"/>
                    </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>
        <ul id="div_wrapper_left_ul_resourcetree" class="m-snav"></ul>
    </div>
    <div position="center" style="margin-left:10px;margin-top:10px;margin-right:10px;">
        <!-- ####### 查询条件部分 ####### -->
        <div class="m-form-inline" data-role-form>
            <div class="m-form-group">
                <div class="m-form-control">
                    <!--输入框-->
                    <input type="text" id="inp_search" placeholder="请输入资源名称" data-attr-scan="searchNm"/>
                </div>
                <div class="m-form-control">
                    <!--按钮:查询 & 新增-->
                    <div id="btn_search" class="l-button">
                        <span><spring:message code="btn.search"/></span>
                    </div>
                    <div class="m-form-control m-form-control-fr" style="float: right">
                        <div id="btn_add" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                            <span>新增</span>
                        </div>
                </div>
                <div class="m-form-control right" >
                    <div id="btn_add" class="l-button">
                        <span>新增</span>
                    </div>
                </div>
            </div>
        </div>
            <!--###### 查询明细列表 ######-->
            <div id="div_app_info_grid">
        <!--###### 查询明细列表 ######-->
        <div id="div_app_info_grid">
            </div>
        </div>
    </div>
</div>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceManageCss.jsp

@@ -1,6 +0,0 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<style>
</style>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceManageJs.jsp

@@ -2,7 +2,6 @@
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<script>
    var rsResoureManege = {
        $element: $('.m-retrieve-area'),
        $searchresourceName: $('#inp_search'),//资源名称文本匡对象
        $catalogDDL: $('#ipt_catalog'),
        $statusDDL: $('#ipt_status'),
@@ -73,10 +72,7 @@
                var selectData = resourceTree.getSelected();
                rsResoureManege.reloadGrid(selectData ? selectData.data.id : "", searchNm);
            })
            this.$element.show();
            this.$element.attrScan();
            window.form = this.$element;
            
            this.initGrid();
        },
@@ -96,7 +92,6 @@
                    catalog: catalog,
                    status: status
                },
                height:"98%",
                columns: [
                    {display: '资源名称', name: 'name', width: '15%', isAllowHide: false},
                    {display: '资源代码', name: 'code', width: '31.5%',dict:true,dictName: "RESOURCE_CODE"},
@@ -152,8 +147,7 @@
                    rsResoureManege.editor(data.id, "modify");
                }
            });
            // 自适应宽度
            // this.grid.adjustToWidth();
        },
        reloadGrid: function (categoryId, resourcename) {
            this.grid.loadServerData({
@@ -214,7 +208,8 @@
        look: function (id) {
            //跳转到资源浏览界面
            indexPage.openChildPage("资源浏览", '${contextRoot}/resource/resourceBrowse?id=' + id + '');
        }, dialogCallBack: function (message) {
        },
        dialogCallBack: function (message) {
            $.ligerDialog.success(message);
            rsResoureManege.grid.reload();
            rsResoureManege.appInfoDialog.close();

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

@@ -4,25 +4,23 @@
<!--######用户管理页面Title设置######-->
<!-- ####### 页面部分 ####### -->
<div class="m-content">
    <div id="div_wrapper">
        <!-- ####### 查询条件部分 ####### -->
        <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">
                        <input type="text" id="txtName" class="l-text-field" placeholder="请输入代码或名称"/>
                </div>
    <!-- ####### 查询条件部分 ####### -->
    <div class="m-form-inline">
        <div class="m-form-group">
            <div class="m-form-control">
                    <input type="text" id="txtName" class="l-text-field" placeholder="请输入代码或名称"/>
            </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>
                    </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>
                </div>
            </div>
        </div>
    </div>
        <!--######菜单信息表######-->
        <div id="div_grid">
    <!--######菜单信息表######-->
    <div id="div_grid">
        </div>
    </div>
</div>

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

@@ -4,27 +4,26 @@
<!--######用户管理页面Title设置######-->
<!-- ####### 页面部分 ####### -->
<div class="m-content">
    <div id="div_wrapper">
        <!-- ####### 查询条件部分 ####### -->
        <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="m-form-inline">
        <div class="m-form-group">
            <div class="m-form-control">
                        <input type="text" id="txtName" class="l-text-field" placeholder="请输入角色名称"/>
                    <input type="text" id="txtName" class="l-text-field" placeholder="请输入角色名称"/>
                </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>
                    </div>
            <div class="m-form-control right" >
                <div id="div_new_record" class="l-button">
                    <span>新增</span>
                </div>
            </div>
        </div>
    </div>
        <!--######菜单信息表######-->
        <div id="div_grid">
    <!--######菜单信息表######-->
    <div id="div_grid">
        </div>
    </div>
</div>

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

@@ -1,21 +0,0 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<style>
    #div_wrapper #div_wrapper_right .div_wrapper_right_top .m-form-inline .m-form-group {
        margin-bottom: 0px;
    }
    #div_wrapper #div_wrapper_right .div_wrapper_right_top .m-form-inline .m-form-group span {
        line-height: 2
    }
    #div_wrapper #div_wrapper_right .div_wrapper_right_top .m-form-inline .m-form-group center hr {
        height: 1px;
        border: none;
        border-top: 1px solid #2d9bd2;
        margin-top: 0px;
        margin-bottom: 0px
    }
</style>

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

@@ -19,8 +19,8 @@
                    name: $('#txtName').val()
                },
                columns: [
                    {display: '用户名',id: 'loginCode', name: 'loginCode', width: '15%'},
                    {display: '姓名', name: 'userName', width: '15%'},
                    {display: '用户名',id: 'loginCode', name: 'loginCode', width: '20%'},
                    {display: '姓名', name: 'userName', width: '20%'},
                    {display: '角色名', name: 'roleName', width: '30%'},
                    {
                        display: '操作', name: 'operator', width: '30%', render: function (row) {
@@ -41,14 +41,7 @@
                onDblClickRow: function (row) {
                    me.editorDialog(row.id);
                },
                alternatingRow: false,
                rownumbers: true,
                checkbox: false,
                pageSize:10,
                page:1,
                heightDiff: -10,
                headerRowHeight: 40,
                rowHeight: 40
                alternatingRow: false
            });
            me.bindEvents();

Hos-resource/src/main/webapp/develop/lib/ligerui/custom/ligerEx.js

@@ -825,13 +825,35 @@
        message:null //校验提示
    };
    $.ligerMethos.AutoForm = {};
    $.ligerMethos.AutoForm = {
        showError:function(control,error){
            var dom = $(control).closest(".m-form-control");
            if(dom.hasClass('m-from-error'))
            {
                dom.removeClass('m-from-error').find('.m-from-error-msg').remove();
            }
            var el = $('<div class="m-from-error-msg"></div>');
            dom.addClass('m-from-error').append(el);
            el.hover(function ()
            {
                $(this).ligerTip({content:error});
            },function (){
                $(this).ligerHideTip();
            });
        }
    };
    $.ligerui.controls.AutoForm = function (element, options)
    {
        $.ligerui.controls.AutoForm.base.constructor.call(this, element, options);
    };
    $.ligerui.controls.AutoForm.ligerExtend($.ligerui.core.UIComponent, {
        controls:[], //表单控件
        defaultMessage:{
@@ -1027,7 +1049,7 @@
                    }
                }
                else if(rule== "equalTo")
                {debugger
                {
                    if(ruleValue=="") {
                        return "密码未输入";
                    }
@@ -1044,7 +1066,6 @@
                        {
                            case "email":
                            {
                                var re =new RegExp("^([a-zA-Z0-9]+[_|\\_|\\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\\_|\\.]?)*[a-zA-Z0-9]+\\.[a-zA-Z]{2,3}$");
                                if(!re.test(value))
                                {
@@ -1054,8 +1075,6 @@
                            }
                            case "ip":
                            {
                                 var re =new RegExp("^(2[5][0-5]|2[0-4]\\d|1\\d{2}|\\d{1,2})\\.(25[0-5]|2[0-4]\\d|1\\d{2}|\\d{1,2})\\.(25[0-5]|2[0-4]\\d|1\\d{2}|\\d{1,2})\\.(25[0-5]|2[0-4]\\d|1\\d{2}|\\d{1,2})$");
                                debugger
                                if(!re.test(value))
@@ -1220,38 +1239,44 @@
                        //是否报错
                        if (error.length > 0) {
                            if (typeof(message) == "string")
                                error = message;//用户自定义消息覆盖默认消息
                            else {
                                for (var m in message) {
                                    var value = message[m];
                                    if (m == "required" && me.flag == 1) {
                                        error = value;
                                    }
                                    else if (m == "minlength" && me.flag == 2) {
                            if(message!=undefined&&message!=null)
                            {
                                if (typeof(message) == "string")
                                {
                                    error = message;//用户自定义消息覆盖默认消息
                                }
                                else {
                                    for (var m in message) {
                                        var value = message[m];
                                        if (m == "required" && me.flag == 1) {
                                            error = value;
                                        }
                                        else if (m == "minlength" && me.flag == 2) {
                                        error = value;
                                    }
                                    else if (m == "maxlength" && me.flag == 3) {
                                        error = value;
                                    }
                                    //判断相等情况，以赋值替代val
                                    else if (m == "equalTo" && me.flag == 4) {
                                        error = value;
                                    }
                                    else if (m == "digits" && me.flag == 5) {
                                        error = value;
                                    }
                                    else if (m == "email" && me.flag == 6) {
                                        error = value;
                                    }
                                    else if (m == "ip" && me.flag == 7) {
                                        error = value;
                                            error = value;
                                        }
                                        else if (m == "maxlength" && me.flag == 3) {
                                            error = value;
                                        }
                                        //判断相等情况，以赋值替代val
                                        else if (m == "equalTo" && me.flag == 4) {
                                            error = value;
                                        }
                                        else if (m == "digits" && me.flag == 5) {
                                            error = value;
                                        }
                                        else if (m == "email" && me.flag == 6) {
                                            error = value;
                                        }
                                        else if (m == "ip" && me.flag == 7) {
                                            error = value;
                                        }
                                    }
                                }
                            }
                            if (me.flag == 1) {
                            me.showError(control, error);
                            /*if (me.flag == 1) {
                                me.showError(control, error);//required优先级高
                            }
                            else if (me.flag == 2) {
@@ -1271,7 +1296,8 @@
                            }
                            else if (me.flag == 7) {
                                me.showError(control, error);//
                            }
                            }*/
                            //else  if(message!=null && message.length > 0){
                            // me.showError(control,message);
                            // }