Merge branch 'master' of http://192.168.1.220:10080/esb/esb

src/main/webapp/WEB-INF/ehr/jsp/system/flow/editorFlow.jsp

@@ -43,7 +43,7 @@
            <label><span class="red">*&nbsp;</span>流程图：</label>
            <div class="m-form-control">
                <form id="formIcon" action="${contextRoot}/flow/upload" method="post" enctype="multipart/form-data">
                    <input type="text" name="chart" class="l-textbox btnIconGrayUp" style="width: 144px;"  placeholder="点击选择图片" readonly="readonly" data-id="">
                    <input type="text" id="iconUrl" name="chart" class="l-textbox btnIconGrayUp" style="width: 144px;"  placeholder="点击选择图片" readonly="readonly" data-id="">
                    <div style="float: right;">
                        <div  class="l-button l-button-no formIcon" data-id="formIcon">
                            <span style="background-color: rgb(240, 240, 240);">导入</span>

src/main/webapp/WEB-INF/ehr/jsp/system/flow/editorFlowJs.jsp

@@ -20,9 +20,24 @@
        initForm: function () {
            var me = this;
           var data;
            var iconUrl;
            var modelString = "${model.id}";
            if(modelString!=undefined && modelString!=null && modelString.length>0)
            {
                debugger
                var icon = $("#iconUrl").attr("data-id");
                if(icon!='' && icon!='undefine'){
                    if(icon!= "${model.chart}"){
                        iconUrl =icon;
                    }else{
                        iconUrl = "${model.chart}";
                    }
                }else{
                    iconUrl = "${model.chart}";
                }
                var valid = "${model.valid}";
                liger.get("valid").selectValue(valid);
               data={
@@ -30,7 +45,7 @@
                    name: "${model.name}",
                   code: "${model.code}",
                   path: "${model.path}",
                   chart:"${model.chart}",
                   chart:iconUrl,
                   valid:"${model.valid}",
                   flowClassList: '${flowClass}',
                   flowClassArray:'${model.flowClassArray}',
@@ -86,6 +101,7 @@
                }
                var index =newMaxFormIndex();
                if(index==0){index=1;}
                    for (var i = index; i > 0; i--) {
                        me.bindFlowClass(i);
                    }
@@ -131,7 +147,7 @@
            /* =====================添加新节点========================= */
            $(".m-form-group").on("click","#btnAddClass",function () {
                var index =newMaxFormIndex();
                if( index>1){
                if(index>0){
                    index++
                }
                var html = '<div class="flows"  dataIndex="'+index+'" id="paramGroup'+index+'">';
@@ -198,7 +214,8 @@
                        success:  function processJson(data){
                            if(data.successFlg){
                                formsay.attr("class","say true").html("上传成功");
                                formObj.find("input[type=text]").attr("data-id",data.message)//设置已上传的文件的ID
                                formObj.find("input[type=text]").attr("data-id","/upload/"+data.message)//设置已上传的文件的ID
                                formObj.find("input[type=text]").val("/upload/"+data.message)//设置已上传的文件的ID
                                formObj.closest("div").find("span").html("重新导入<i></i>");
                            }else{
@@ -348,9 +365,9 @@
                    success:  function processJson(data){
                        if(data.successFlg){
                            formsay.attr("class","say true").html("上传成功");
                            formObj.find("input[type=text]").attr("data-id",data.message)//设置已上传的文件的ID
                            formObj.find("input[type=text]").attr("data-id","/upload/"+data.message)//设置已上传的文件的ID
                            var inputVal=formObj.closest("div").find("input[type=text]");
                            inputVal.val(data.message);
                            inputVal.val("/upload/"+data.message);
                            formObj.closest("div").find("span").html("重新导入<i></i>");
                            var isUpdate=formObj.find(".isUpdate");//是否有上传过
                            isUpdate.val("1");//上传过
@@ -396,7 +413,7 @@
        if(size!="" && size>0){
            index=$("#"+$(".flows")[size-1].id).attr("dataIndex");//获取参数的个数
        }else{
            index=1;
            index=0;
        }
        return index;
    }

src/main/webapp/WEB-INF/ehr/jsp/system/flow/flow.jsp

@@ -24,6 +24,9 @@
            </div>
        </div>
    </div>
    <div id="divedit" style="width: 500px;height: 500px;display: none;">
        <img src="" id="divImg" style="width: 500px;text-align:center;">
    </div>
    <!--######菜单信息表######-->
    <div id="div_grid">

src/main/webapp/WEB-INF/ehr/jsp/system/flow/flowJs.jsp

@@ -44,7 +44,7 @@
                        display: '操作', name: 'operator', width: '40%', render: function (row) {
                        var html = '<div class="m-inline-buttons" style="width:350px;">';
                        html += "<a class=\"m-btn\" style=\"padding-right:10px\" onclick=\"flow.showImage('"+row.id+"')\">查看流程图</a>";
                        html += "<a class=\"m-btn\" style=\"padding-right:10px\" onclick=\"flow.showImage('"+row.chart+"')\">查看流程图</a>";
                        html += "<a class=\"m-btn-edit\" onclick=\"flow.editorDialog('"+row.id+"')\"></a>";
                        html += "<a class=\"m-btn-delete\" onclick=\"flow.delete('"+row.id+"')\"></a>";
                        html += '</div>';
@@ -146,21 +146,20 @@
                urlParms: params
            });
        },
        showImage: function (id) {
        showImage: function (chart) {
            var me = this;
            var title = "流程详情";
            var params = null;
            if (id != undefined && id != null) {
                params = {"id": id};
            }
            var title = "流程图";
            debugger
            var url = "${contextRoot}"+"/"+chart;
            $("#divedit").show();
            $("#divImg").attr("src",url);
            me.dialog = $.ligerDialog.open({
                height: 500,
                width: 500,
                title: title,
                url: '${contextRoot}/app/flowDetail',
                //load: true,
                urlParms: params
                target:$("#divedit"),
                title: title
            });
        },
    anthorize: function (id) {