Merge branch 'master' of huangzhanpeng/esb_huangzhanpeng into master

Hos-resource/src/main/java/com/yihu/ehr/resource/service/impl/RsCategoryServiceImpl.java

@@ -66,13 +66,13 @@ public class RsCategoryServiceImpl implements IRsCategoryService {
        List<RsResourceCategory> categoryList = rsCategoryDao.getCategoryByPid(id);
        if(categoryList==null || categoryList.size()>0)
        {
            return Result.error("存在子节点，不允许删除！");
            return Result.error("该分类包含子分类，不可直接删除！");
        }
        //判断是否存在资源
        List<RsResource> resourceList =  rsResourceDao.getAllRsResourceByCategory(id);
        if(resourceList==null || resourceList.size()>0)
        {
            return Result.error("存在所属资源，不允许删除！");
            return Result.error("该分类包含注册资源，不可直接删除！");
        }
        RsResourceCategory rc = rsCategoryDao.getEntity(RsResourceCategory.class, id);

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

@@ -21,8 +21,9 @@
            $("#div_form").show().steps({
                //transitionEffect: "fade",
                onStepChanging:function(d,from,to){
                    if(from>to){
                        return true
                        return true;
                    }
                    else{
                        return me.verify(to);
@@ -64,7 +65,10 @@
                            me.$listDataset.reload();
                            me.needReload=false;
                        }
                        else{
                        if(me.needRender)
                        {
                            alert(1);
                            me.$listDataset.setData($("#txtJobDataset").val());
                            me.$listDataset.reRender();
                        }
                    }
@@ -101,7 +105,13 @@
            $("a[href='#cancel']").addClass("l-button-no");
            //业务类型
            $('#jobContentClass').ligerComboBox({dict:true,dictName:'JOB_CONTENT_CLASS'});
            $('#jobContentClass').ligerComboBox({
                dict:true,
                dictName:'JOB_CONTENT_CLASS',
                onChange:function(){
                    me.needRender = true;
                }
            });
            $('input[name="jobContentType"]').ligerRadio();
            $(document).on('click','input[name="jobContentType"]',function(){
@@ -205,6 +215,10 @@
                        data.checked ="0";
                    editorJob.setCheckVal();
                },
                //全选事件
                onCheckAllRow:function(){
                    me.setCheckVal();
                },
                //加载完成后赋值$("#txtJobDataset")
                onAfterShowData:function(grid)
                {

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

@@ -179,7 +179,6 @@
                ],
                validate: true,
                rownumbers: false,
                checkbox: true,
                parms: {datasetId: rsResourceImportDatasetDialog.datasetId},
                allowAdjustColWidth: false,
                width: 240,

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

@@ -6,6 +6,7 @@
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>资源名称：</label>
        <div class="l-text-wrapper m-form-control">
            <input type="hidden" name="id"/>
            <input type="text" id="inp_resource_name" class="required f-w240" placeholder="请输入资源类别名称"  required-title="该项为必输项！" name="name"/>
        </div>
    </div>

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

@@ -100,6 +100,7 @@
    };
    /******************************************************/
    //重写条件选择控件 add by hzp at 20160119
    $.extend($.ligerui.controls.Filter.prototype, {
        getValue: function () {
@@ -1830,6 +1831,29 @@
                value = parseFloat(value).toFixed(p.decimalplace);
            }
            this.inputText.val(value)
        },
        _init: function ()
        {
            $.ligerui.controls.Spinner.base._init.call(this);
            var p = this.options;
            if (p.type == 'float')
            {
                p.step = 0.1;
                p.interval = 300;
            } else if (p.type == 'int')
            {
                p.step = 1;
                p.interval = 300;
            } else if (p.type == 'time')
            {
                p.step = 1;
                p.interval = 300;
            } else
            {
                p.type = "int";
                p.step = 1;
                p.interval = 300;
            }
        }
    });