bug修改与界面改进

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

@@ -507,7 +507,9 @@ public class RsResourceController extends BaseController {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            String datasetId = request.getParameter("datasetId");
            String name = request.getParameter("name");
            params.put("datasetId", datasetId);
            params.put("name", name);
            return resourceService.getDataSet(params);
        } catch (Exception e) {
            e.printStackTrace();

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

@@ -99,8 +99,10 @@ public class RsResourceRestController {
        try {
            String page = request.getParameter("page");
            String rows = request.getParameter("rows");
            String categoryId = request.getParameter("categoryId");
            DataGridResult result = new DataGridResult(Integer.valueOf(page), Integer.valueOf(rows));
            Map<String, Object> conditionMap = new HashMap<>();
            conditionMap.put("categoryId",categoryId);
            result = resourceRestService.getResourceRestList(conditionMap, Integer.valueOf(page), Integer.valueOf(rows));
            return result;
        } catch (Exception e) {

Hos-resource/src/main/java/com/yihu/ehr/resource/dao/impl/RsResourceRestDaoImpl.java

@@ -19,7 +19,7 @@ public class RsResourceRestDaoImpl extends SQLGeneralDAO implements IRsResourceR
        sb.append(" from RsResourceRest r ");
        sb.append(" where 1=1 ");
        if (!StringUtils.isEmpty(conditionMap.get("categoryId"))) {
            sb.append(" and r.category = '" + conditionMap.get("categoryId") + "'");
            sb.append(" and r.name like '%" + conditionMap.get("categoryId") + "%'");
        }
        return super.getDataGridResult(sb.toString(), page, rows);
    }

Hos-resource/src/main/java/com/yihu/ehr/resource/dao/impl/RsResourceRestDetailDaoImpl.java

@@ -21,7 +21,7 @@ public class RsResourceRestDetailDaoImpl extends SQLGeneralDAO implements IRsRes
        sb.append(" from RsResourceRestDetail r ");
        sb.append(" where 1=1 ");
        if (!StringUtils.isEmpty(conditionMap.get("resourceRestId"))) {
            sb.append(" and r.resourceRestId = '" + conditionMap.get("resourceRestId") + "'");
            sb.append(" and r.name like '%" + conditionMap.get("resourceRestId") + "%'");
        }
        return super.getDataGridResult(sb.toString(), page, rows);
    }

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

@@ -40,11 +40,11 @@
            <h3 class="panel-title">采集情况</h3>
        </div>
        <div style="height:122px;">
            <div class="col-sm-3" style="text-align: center;padding-top:40px;">
                <div style="float: left;width:195px">
            <div class="col-sm-3" style="text-align: center;padding-top:10px;">
                <div style="width:255px">
                    <input type="checkbox" class="js-switch" id="jobStatusSwitch" checked />
                </div>
                <div style="float: left;width:190px;border-left:1px solid #e1e1e1;;line-height: 32px;" id="jobStatus">
                <div style="float: left;width:235px;border-left:1px solid #e1e1e1;;line-height: 32px;" id="jobStatus">
                    -
                </div>
                <div style="clear: both;padding-top:20px;">任务调度</div>

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

@@ -1,36 +1,31 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<div class="m-form-inline f-mt20 ">
    <form id="rsCategoryInfoForm">
<div id="rsCategoryInfoForm" class="m-form-inline" style="padding-top:10px;padding-bottom:65px;">
        <div class="m-form-group">
            <label><spring:message code="lbl.designation"/><spring:message code="spe.colon"/></label>
            <label><span class="red">*&nbsp;</span>名称：</label>
            <div class="l-text-wrapper m-form-control essential">
                <input type="hidden" name="id" data-type="text" class="required" hidden/>
                <input type="text" name="name" id="inp_name" data-type="text" class="required f-w240 "
                       placeholder="请输入资源类别名称"
                       required-title="该项为必输项！"/>
            <div class="l-text-wrapper m-form-control ">
                <input type="text" class="l-textbox" placeholder="请输入资源类别名称"  name="name"/>
            </div>
        </div>
        <div class="m-form-group">
            <label><spring:message code="lbl.resource.parent_category"/><spring:message code="spe.colon"/></label>
            <label>父类别：</label>
            <div class="l-text-wrapper m-form-control ">
                <input type="text" name="pid" id="inp_dialog_parent_category" data-type="select" />
                <input type="text" name="pid" id="inp_dialog_parent_category" />
            </div>
        </div>
        <div class="m-form-group" >
            <label><spring:message code="lbl.status"/><spring:message code="spe.colon"/></label>
            <label><span class="red">*&nbsp;</span>状态：</label>
            <div class="l-text-wrapper m-form-control essential" >
                <input type="text" name="status" id="inp_dialog_status" data-type="select" class="required">
            <div class="l-text-wrapper m-form-control " >
                <input type="text" name="status" id="inp_dialog_status">
            </div>
        </div>
        <div class="m-form-group">
            <label>分类说明<spring:message code="spe.colon"/></label>
            <label>分类说明：</label>
            <div class="m-form-control">
                        <textarea rows="10" name="remark" data-type="text"  class="l-textarea"
@@ -38,7 +33,6 @@
                        ></textarea>
            </div>
        </div>
    </form>
    <div class="m-form-bottom">
        <div id="btn_cancel" class="l-button l-button-no">
            <span>关闭</span>

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

@@ -3,24 +3,9 @@
<script type="text/javascript">
    var rsCategoryInfo = {
        $form: $("#rsCategoryInfoForm"),
        $name: $("#inp_name"),
        $parentCategory: $("#inp_dialog_parent_category"),
        $status: $("#inp_dialog_status"),
        dialog: frameElement.dialog,
        $btnSave: $("#btn_save"),
        $btnCancel: $("#btn_cancel"),
        validator: null,
        init: function () {
            this.initForm();
            this.bindEvents();
            rsCategoryInfo.validator = new $.jValidation.Validation(rsCategoryInfo.$form, {
                immediate: true, onSubmit: false,
                onElementValidateForAjax: function (elm) {
                }
            });
        },
        initForm: function () {
            var mode = '${mode}';
@@ -30,39 +15,45 @@
             }
             */
            //初始化下拉框
            this.$name.ligerTextBox({width: 240});
            this.$parentCategory.ligerComboBox({
            $("#inp_dialog_parent_category").ligerComboBox({
                url: "${contextRoot}/resource/rsCategory/getCategoryWithOutId",
                dataParmName: 'detailModelList',
                urlParms: {id: '${model.id}'},
                valueField: 'id',
                textField: 'name'
            });
            this.$status.ligerComboBox({dict: true, dictName: "SYSTEM_STATUS"});
            //回填表单数据
            this.$form.attrScan();
            this.$form.Fields.fillValues({
            $("#inp_dialog_status").ligerComboBox({dict: true, dictName: "SYSTEM_STATUS"});
            var data = {
                name: '${model.name}',
                pid: '${model.pid}',
                status: '${model.status}',
                remark: '${model.remark}',
                id: '${model.id}'
                remark: '${model.remark}'
            };
            $("#rsCategoryInfoForm").ligerAutoForm({
                data:data,
                validate:{
                    status:"required",
                    name: {
                        required:true
                    }
                }
            });
            this.$form.show();
        },
        bindEvents: function () {
            var self = this;
            this.$btnSave.click(function () {
                if (!rsCategoryInfo.validator.validate()) {
            $("#btn_save").click(function () {
                if(!$("#rsCategoryInfoForm").ligerAutoForm("validate"))
                {
                    return;
                }
                var data = $("#rsCategoryInfoForm").ligerAutoForm("getData");
                if ('${mode}' == 'new') {
                    $.ajax({ //ajax处理
                        type: "POST",
                        url: "${contextRoot}/resource/rsCategory/createCategory",
                        dataType: "json",
                        data: self.$form.Fields.getValues(),
                        data:data,
                        cache: false,
                        success: function (data) {
                            if (data.successFlg) {
@@ -81,7 +72,7 @@
                        type: "POST",
                        url: "${contextRoot}/resource/rsCategory/updateCategory",
                        dataType: "json",
                        data: self.$form.Fields.getValues(),
                        data: data,
                        cache: false,
                        success: function (data) {
                            if (data.successFlg) {
@@ -98,8 +89,8 @@
                }
            });
            this.$btnCancel.click(function () {
                rsCategoryInfo.dialog.close();
            $("#btn_cancel").click(function () {
                parent.rsCategoryManage.appInfoDialog.close();
            });
        }
    };

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

@@ -79,7 +79,7 @@
            }
            rsCategoryManage.appInfoDialog = $.ligerDialog.open({
                height: 450,
                height: 500,
                width: 600,
                title: title,
                url: '${contextRoot}/resource/rsCategory/rsCategoryInfo',

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

@@ -19,8 +19,8 @@
            //初始化树
            this.treeInit();
            resource.$searchBox = $("#div_wrapper_left_inp_search").ligerTextBox({
                width: 200, isSearch: true, onChangeValue: function (value) {
            resource.$searchBox = $("#div_wrapper_left_inp_search").ligerSearch({
                width: 190,onClick: function (value) {
                    if (value != "" && value != null && value != undefined && value.length > 0)
                        $.ligerui.get('ul_tree1').queryByText(value);
                }

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

@@ -1,107 +1,94 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<div class="m-content">
    <div id="div_info_form" data-role-form class="m-form-inline f-mt20 " data-role-form>
        <div id="div_info_form_layout">
            <div position="top" title="">
                <div class="m-form-group">
                    <label>字段名称<spring:message code="spe.colon"/></label>
                    <div class="l-text-wrapper m-form-control essential">
                        <input type="hidden" data-type="text" value="${datasetId}"
                               data-attr-scan="datasetId">
                        <input type="hidden" data-type="text" name="resourceId" value="${resourceId}"
                               data-attr-scan="resourceId">
<div id="div_info_form"  class="m-form-inline f-mt20 ">
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>字段名称：</label>
        <div class="m-form-control">
            <input type="hidden" data-type="text">
            <input type="hidden" data-type="text" name="resourceId">
            <input type="hidden" id="inp_resource_id"  name="id">
            <input type="text" id="inp_field_name" placeholder="请输入字段名称"
                   required-title="该项为必填项！" name="name"/>
        </div>
    </div>
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>字段代码：</label>
                        <input type="hidden" id="inp_resource_id" data-type="text" class="required" data-attr-scan="id">
                        <input type="text" id="inp_field_name" class="required f-w240" placeholder="请输入字段名称"
                               required-title="该项为必输项！" data-attr-scan="name"/>
                    </div>
                </div>
                <div class="m-form-group">
                    <label>字段代码<spring:message code="spe.colon"/></label>
                    <div class="l-text-wrapper m-form-control essential">
                        <input type="text" id="inp_field_code" data-type="select" class="required"
                               data-attr-scan="columnCode">
                    </div>
                </div>
                <div class="m-form-group">
                    <label>字段类型<spring:message code="spe.colon"/></label>
        <div class="l-text-wrapper m-form-control ">
            <input type="text" id="inp_field_code" data-type="select" class="required"
                   data-attr-scan="columnCode" name="columnCode">
        </div>
    </div>
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>字段类型：</label>
                    <div class="l-text-wrapper m-form-control essential">
                        <input type="text" id="inp_field_type" data-type="select" class="required"
                               data-attr-scan="columnType">
                    </div>
                </div>
                <div class="m-form-group">
                    <label>字段长度<spring:message code="spe.colon"/></label>
        <div class="l-text-wrapper m-form-control">
            <input type="text" id="inp_field_type" name="columnType">
        </div>
    </div>
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>字段长度：</label>
                    <div class="u-checkbox-wrap m-form-control essential">
                        <input type="text" id="inp_field_length" class="required" data-attr-scan="columnLength"  >
                    </div>
                </div>
                <div class="m-form-group">
                    <label>是否主键<spring:message code="spe.colon"/></label>
                    <div class="u-checkbox-wrap m-form-control essential">
                        <input type="radio" value="1" name="inp_field_is_PK" data-attr-scan="primaryKey">是
                        <input type="radio" checked value="0" name="inp_field_is_PK" data-attr-scan="primaryKey">否
                    </div>
                    <label style="width: 90px">是否可为空<spring:message code="spe.colon"/></label>
                    <div class="u-checkbox-wrap m-form-control essential">
                        <input type="radio" checked value="1" name="inp_field_is_null" data-attr-scan="nullable">是
                        <input type="radio" value="0" name="inp_field_is_null" data-attr-scan="nullable">否
                    </div>
                </div>
                <div class="m-form-group">
                    <label>字段说明<spring:message code="spe.colon"/></label>
        <div class="u-checkbox-wrap m-form-control">
            <input type="text" id="inp_field_length" name="columnLength"  >
        </div>
    </div>
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>是否主键</label>
        <div class="u-checkbox-wrap m-form-control ">
            <input type="radio" value="1" name="inp_field_is_PK" name="primaryKey">是
            <input type="radio" checked value="0" name="inp_field_is_PK" name="primaryKey">否
        </div>
        <label style="width: 90px"><span class="red">*&nbsp;</span>是否能空</label>
        <div class="u-checkbox-wrap m-form-control ">
            <input type="radio" checked value="1" name="inp_field_is_null" name="nullable">是
            <input type="radio" value="0" name="inp_field_is_null" name="nullable">否
        </div>
    </div>
    <div class="m-form-group">
        <label>字段说明：</label>
                    <div class="u-checkbox-wrap m-form-control ">
                        <input type="text" id="inp_field_remark"  data-attr-scan="definition">
        <div class="u-checkbox-wrap m-form-control ">
            <input type="text" id="inp_field_remark"  name="definition">
                    </div>
                </div>
            </div>
            <div position="center" title="">
                <div class="m-form-group">
                    <label>数据来源<spring:message code="spe.colon"/></label>
        </div>
    </div>
    <div class="m-form-group">
        <label>数据来源</label>
                    <div class="u-checkbox-wrap m-form-control ">
                        <label id="inp_dataset_from" style="text-align:left">逻辑表</label>    </div>
                </div>
                <div id="centerTab1" style="display:none">
                    <div style="margin-left: 70px;float: left">
        <div class="u-checkbox-wrap m-form-control ">
            <input type="radio" checked value="1" name="inp_dataset_from" >逻辑表
            <input type="radio" value="0" name="inp_dataset_from" >事实表
        </div>
    </div>
    <div id="centerTab1" style="display:none">
        <div style="margin-left: 70px;float: left">
                        <div id="left_datagrid"></div>
                    </div>
                    <div style="margin-left: 10px;float: left">
            <div id="left_datagrid"></div>
        </div>
        <div style="margin-left: 10px;float: left">
                        <div id="right_datagrid"></div>
                    </div>
                </div>
                <div id="centerTab2">
                    <div class="m-form-group">
                        <label>逻辑数据来源<spring:message code="spe.colon"/></label>
            <div id="right_datagrid"></div>
        </div>
    </div>
    <div id="centerTab2">
        <div class="m-form-group">
            <label>逻辑数据来源</label>
                        <div class="m-form-control">
                        <textarea rows="10" class="l-textarea" style="width:350px;height: 350px"
                                  data-attr-scan="logicDataSource"></textarea>
                        </div>
                    </div>
                </div>
            </div>
            <div position="bottom" title="">
                <div class="m-form-bottom">
                    <div id="btn_cancel" class="l-button l-button-no">
                        <span>关闭</span>
                    </div>
                    <div id="btn_save" class="l-button">
                        <span>保存</span>
                    </div>
                </div>
            <div class="m-form-control">
            <textarea rows="10" class="l-textarea" style="width:350px;height: 350px" name="logicDataSource"></textarea>
            </div>
        </div>
    </div>
    <div class="m-form-bottom">
        <div id="btn_cancel" class="l-button l-button-no">
            <span>关闭</span>
        </div>
        <div id="btn_save" class="l-button">
            <span>保存</span>
        </div>
    </div>
</div>

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

@@ -13,12 +13,11 @@
        $fieldIsPK: $('input[name="inp_field_is_PK"]', this.$form),//是否主键
        $fieldIsNull: $('input[name="inp_field_is_null"]', this.$form),//是否可为空
        $fieldRemark: $("#inp_field_remark"),//字段说明
        $datasetFrom: $('#inp_dataset_from', this.$form),//是否可为空
        $datasetFrom: $('input[name="inp_dataset_from"]', this.$form),//是否可为空
        $leftDatagrid: $("#left_datagrid"),//左边的datagrid
        $rightDatagrid: $("#right_datagrid"),//右边的datagrid
        $centerTab1: $("#centerTab1"),//右边的datagrid
        $centerTab2: $("#centerTab2"),//右边的datagrid
        validator: null,
        $id: $("#inp_resource_id"),//资源数据源
@@ -42,11 +41,6 @@
                this.$fieldRemark.attr("disabled", "false");
                this.$btnSave.hide();
            }
            rsResourceFieldInfoDialog.validator =  new $.jValidation.Validation(rsResourceFieldInfoDialog.$form, {immediate: true, onSubmit: false,
                onElementValidateForAjax:function(elm){
                }
            });
        },
        initlayout: function () {
            //初始化layout
@@ -115,15 +109,13 @@
            }
            this.$fieldName.ligerTextBox({width: 240});
            this.$fieldCode.ligerTextBox({width: 240});
            this.$fieldLength.ligerTextBox({width: 240,digits:true});
            this.$fieldLength.ligerSpinner({width: 240,type:'int',isNegative:false });
            this.$fieldType.ligerComboBox({dict: true, dictName: "RESOURCE_METADATA_TYPE"});
            this.$fieldIsPK.ligerRadio();
            this.$datasetFrom.ligerRadio();
            this.$fieldIsNull.ligerRadio();
            this.$fieldRemark.ligerTextBox({width: 240});
            this.$form.attrScan();
            //回填表单
            this.$form.Fields.fillValues({
            var data={
                name: '${entity.name}',
                columnType: '${entity.columnType}',
                columnCode: '${entity.code}',
@@ -133,6 +125,15 @@
                nullable: '${entity.nullable}',
                definition: '${entity.definition}',
                logicDataSource: '${entity.logicDataSource}'
            };
            $("#div_info_form").ligerAutoForm({
                data:data,
                validate:{
                    name:"required",
                    columnType:"required",
                    columnCode:"required",
                    columnLength:"required"
                }
            });
            rsResourceFieldInfoDialog.$datasetFrom.text('${entity.dataSupportType}'==1?"事实表":"逻辑表")
            if ("${entity.dataSupportType}" == "1") {
@@ -142,20 +143,20 @@
                rsResourceFieldInfoDialog.$centerTab1.hide();
                rsResourceFieldInfoDialog.$centerTab2.show();
            }
            this.$form.show();
        },
        bindEvents: function () {
            var self = this;
            this.$btnSave.click(function () {
                if(!rsResourceFieldInfoDialog.validator.validate()){
                debugger
                if(!$("#div_info_form").ligerAutoForm("validate")){
                    return;
                }
                var data = $("#div_info_form").ligerAutoForm("getData");
                if ('${mode}' == 'new') {
                    $.ajax({ //ajax处理
                        type: "POST",
                        url: "${contextRoot}/resource/resource/createMetaData",
                        dataType: "json",
                        data: self.$form.Fields.getValues(),
                        data: data,
                        cache: false,
                        success: function (data) {
                            if(data.successFlg){
@@ -170,11 +171,12 @@
                        }
                    });
                } else if ('${mode}' == 'modify') {
                    $.ajax({ //ajax处理
                        type: "POST",
                        url: "${contextRoot}/resource/resource/updateMetaData",
                        dataType: "json",
                        data: self.$form.Fields.getValues(),
                        data: data,
                        cache: false,
                        success: function (data) {
                            if(data.successFlg){

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

@@ -156,9 +156,15 @@
            this.$btnCancel.click(function () {
                rsResourceImportDatasetDialog.dialog.close();
            });
            this.$searchBtn.ligerTextBox({
                width: 180, onChangeValue: function (value) {
                    rsResourceImportDatasetDialog.$leftDG.queryByText("name", value);
            this.$searchBtn.ligerSearch({
                width: 180, onClick: function (value) {
                    //rsResourceImportDatasetDialog.$leftDG.queryByText("name", value);
                    rsResourceImportDatasetDialog.$leftDG.set({
                        parms: {name:rsResourceImportDatasetDialog.$searchBtn.val()}
                    });
                    rsResourceImportDatasetDialog.$leftDG.reload();
                    rsResourceImportDatasetDialog.$leftDG.changePage("first");
                }
            });

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

@@ -21,12 +21,6 @@
                        <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>
                    </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>

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

@@ -47,7 +47,7 @@
                        parentIDFieldName: 'pid',
                        isExpand: false,
                        onClick: function (obj) {
                            rsResoureManege.reloadGrid(obj.data.id, rsResoureManege.$searchresourceName.val());
                            rsResoureManege.reloadGridTree(obj.data.id, rsResoureManege.$searchresourceName.val());
                            rsResoureManege.$resourceTreeId=obj.data.id;
                        },
                        onSuccess: function (data) {
@@ -58,21 +58,16 @@
            });
            //初始化树上面的搜索框
            this.$searchTreeBox.ligerTextBox({
                width: 200, isSearch: true, onChangeValue: function (value) {
            this.$searchTreeBox.ligerSearch({
                width: 200,onClick: function (value) {
                    if (value != "" && value != null && value != undefined && value.length > 0)
                        $.ligerui.get('div_wrapper_left_ul_resourcetree').queryByText(value);
                }
            });
            //初始化文本框
            this.$searchresourceName.ligerTextBox({width: 240});
            //初始化搜索按钮
            var this$searchresourceName = this.$searchresourceName;
            this.$searchBtn.click(function () {
                var searchNm = this$searchresourceName.val();
                var selectData = resourceTree.getSelected();
                rsResoureManege.reloadGrid(selectData ? selectData.data.id : "", searchNm);
            })
            //初始化sousuokuang
            this.$searchresourceName.ligerSearch({onClick:function(value){
                rsResoureManege.reloadGridSearch();
            }});
            this.$element.show();
            this.$element.attrScan();
@@ -92,12 +87,13 @@
            this.grid = $("#div_app_info_grid").ligerGrid({
                url: '${contextRoot}/resource/resource/searchRsResource',
                cache:false,
                parms: {
                    catalog: catalog,
                    status: status
                },
                columns: [
                    {display: '名称', name: 'name', width: '15%', isAllowHide: false},
                    {display: '名称',id:'name', name: 'name', width: '15%', isAllowHide: false},
                    {display: '数据来源', name: 'code', width: '31.5%',dict:true,dictName: "RESOURCE_CODE"},
                    {
                        display: '资源类型', name: 'type', width: '15%', resizable: true, render: function (row) {
@@ -154,7 +150,7 @@
            // 自适应宽度
            // this.grid.adjustToWidth();
        },
        reloadGrid: function (categoryId, resourcename) {
        reloadGridTree: function (categoryId, resourcename) {
            this.grid.loadServerData({
                "categoryId": categoryId,
                "resourceName": resourcename,
@@ -162,6 +158,14 @@
                "rows": 10
            });
        },
        reloadGridSearch: function () {
            this.grid.set({
                parms: {resourceName:$('#inp_search').val(),categoryId:rsResoureManege.$resourceTreeId}
            });
            this.grid.reload();
            this.grid.changePage("first");
        },
        editor: function (id, mode) {
            var title = '';
@@ -196,7 +200,7 @@
                        url: "${contextRoot}/resource/resource/deleteResource",
                        data: {"id": id},
                        success: function (msg) {
                            rsResoureManege.reloadGrid();
                            rsResoureManege.reloadGridSearch();
                        }
                    });
                }
@@ -213,8 +217,12 @@
        look: function (id) {
            //跳转到资源浏览界面
            indexPage.openChildPage("资源浏览", '${contextRoot}/resource/resourceBrowse?id=' + id + '');
        }, dialogCallBack: function (message) {
        },
        dialogCallBack: function (message) {
            $.ligerDialog.success(message);
            rsResoureManege.grid.set({
                parms: {categoryId:rsResoureManege.$resourceTreeId}
            });
            rsResoureManege.grid.reload();
            rsResoureManege.appInfoDialog.close();
        }

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

@@ -12,6 +12,8 @@
        $dictGrid: $("#dict_grid"),//字典datagrid
        $dictItemGrid: $("#dictItem_grid"),//字典datagrid
        $dialog:null,
        grid:null,
        grid1:null,
        init: function () {
            this.initLayout();
            this.initButton();
@@ -33,12 +35,23 @@
        },
        initButton: function () {
            this.$dictname.ligerTextBox({
                width: 200, isSearch: true, onChangeValue: function (value) {
            $("#dictname").ligerSearch({
                width: 200,onClick: function (value) {
                    resourceRest.grid.set({
                        parms: {categoryId: $("#dictname").val()}
                    });
                    resourceRest.grid.reload();
                    resourceRest.grid.changePage("first");
                }
            });
            this.$dictItemName.ligerTextBox({
                width: 200, isSearch: true, onChangeValue: function (value) {
            this.$dictItemName.ligerSearch({
                width: 200,onClick: function (value) {
                    resourceRest.$dictItemGrid.set({
                        parms: {resourceRestId: $("#dictItemName").val()}
                    });
                    resourceRest.$dictItemGrid.reload();
                    resourceRest.$dictItemGrid.changePage("first");
                }
            });
            this.$btnADDDict.click(function(){
@@ -151,7 +164,7 @@
            this.$dialog.close();
        },
        initGrid: function () {
            this.$dictGrid=this.$dictGrid.ligerGrid({
            this.grid=$("#dict_grid").ligerGrid({
                url: '${contextRoot}/resourceRest/getResourceRestList',
                columns: [
                    {display: '业务资源名称', name: 'name', width: '25%'},

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

@@ -8,7 +8,7 @@
    <form class="m-form-inline">
        <div class="m-form-group">
            <div class="m-form-control">
                <input type="text" id="txtName"/>
                <input type="text" id="txtName"  placeholder="请输入代码或名称"/>
            </div>
            <div class="m-form-control right">
                <div id="btnAdd" class="l-button" >

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

@@ -17,7 +17,7 @@
    <div class="m-form-control">
      <div class="l-text">
        <input type="password" class="l-text-field" id="newPassword" name="newPassword"/>
        <input type="text" class="l-text-field" id="newPassword" name="newPassword"/>
      </div>
    </div>
  </div>

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

@@ -871,10 +871,16 @@
            me.controls = [];
            var jform = $(this.element);
            $("textarea", jform).each(function () {
                var name = $(this).attr(name);
                if(name!=undefined && name.length>0) {
                    me.controls.push({name:name,control:$(this)});
                try {
                    var name = $(this).attr("name");
                    if (name != undefined && name.length > 0) {
                        me.controls.push({name: name, control: $(this)});
                    }
                }
                catch(e){
                    return;
                }
            });
            $("input", jform).each(function ()
            {
@@ -1219,7 +1225,7 @@
                        }
                        //是否报错
                        if (error.length > 0) {
                    if (error.length > 0) {
                            if (typeof(message) == "string")
                                error = message;//用户自定义消息覆盖默认消息
                            else {
@@ -1272,9 +1278,9 @@
                            else if (me.flag == 7) {
                                me.showError(control, error);//
                            }
                            //else  if(message!=null && message.length > 0){
                            // me.showError(control,message);
                            // }
                            else  if(error!=null && error.length > 0){
                             me.showError(control,error);
                             }
                            suc = false;
                        }
                    else