Merge branch 'master' of lulihong0928/esb into master

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

@@ -15,6 +15,7 @@
        $conditionDialog:null,//数据集配置条件弹窗
        $condition:null,//条件选择控件
        needReload:true, //需要刷新关联数据集
        needReloadCrawlerDst:false,//判断是否类名为任务编排上传类
        actionUrl:"${contextRoot}/datacollect/addJob",
        //初始化
        init: function ()
@@ -34,15 +35,18 @@
                },
                onStepChanged:function(b,to,from){
                    if(to==1){
                        
                        if($('#jobContentClass').ligerComboBox("getValue")==me.crawlerFlowUpload){//类名为任务编排上传类
                            me.needReloadCrawlerDst = true;
                            me.$listPlan.setOptions({ url: '${contextRoot}/crawler/savedSchemeList'});
                            me.$listPlan.loadData(true);
                            me.$listPlan.reload(true);
                        }else{
                            me.$listPlan._setData($.parseJSON('${schemeList}'));
                            me.$listPlan.reRender();
                        }
                    }
                    else if(to==2){
                        
                        //接口为档案上传时，数据集不可编辑
                        if($('#jobContentClass').ligerComboBox("getValue")==me.archiveUpload)
                        {
@@ -54,7 +58,7 @@
                            $("#listDataset").hide();
                            $("#crawlerListDataset").show();
                            var selected = me.$listPlan.getSelectedRow();
                            if(selected!=null) {
                            if(selected!=null && me.needReloadCrawlerDst) {
                                me.$crawlerFlowDataset.setOptions({url: '${contextRoot}/crawler/savedJobData', parms: [{ name: 'version', value:selected.id}],checkbox:false});
                                me.$crawlerFlowDataset.set("columns", [
                                    { display: '数据集代码', name: 'jobDatasetCode' },
@@ -162,6 +166,15 @@
                isChecked:function(row){
                    if($("#txtSchemeVersion").val()==row.version)
                    {
                        if(me.needReloadCrawlerDst && $('#jobContentClass').ligerComboBox("getValue")==me.crawlerFlowUpload){//类名为任务编排上传类
                            me.$crawlerFlowDataset.setOptions({url: '${contextRoot}/crawler/savedJobData', parms: [{ name: 'version', value:row.id}],checkbox:false});
                            me.$crawlerFlowDataset.set("columns", [
                                { display: '数据集代码', name: 'jobDatasetCode' },
                                { display: '数据集名称', name: 'jobDatasetName' }
                            ]);
                            me.$crawlerFlowDataset.loadData(true);
                            me.needReloadCrawlerDst = false;
                        }
                        return true;
                    }
                    else{
@@ -377,7 +390,7 @@
                $('input[name="jobType"]').ligerRadio('setValue',model.jobType);
                //非档案上传时隐藏
                if($('#jobContentClass').ligerComboBox("getValue")==me.archiveUpload) {
                if($('#jobContentClass').ligerComboBox("getValue")==me.archiveUpload || $('#jobContentClass').ligerComboBox("getValue")==me.crawlerFlowUpload) {
                    $("#divDelayTime").hide();
                    $("#divRepeat").hide();
                }
@@ -386,7 +399,7 @@
                {
                    $("#divTimeInterval").hide();
                    //接口为档案上传时
                    if($('#jobContentClass').ligerComboBox("getValue")==me.archiveUpload) {
                    if($('#jobContentClass').ligerComboBox("getValue")==me.archiveUpload  || $('#jobContentClass').ligerComboBox("getValue")==me.crawlerFlowUpload) {
                        $("#divDelayTime").hide();
                        $("#divRepeat").show();
                        $("#repeatStartTime").ligerDateEditor("setValue",model.repeatStartTime);
@@ -396,7 +409,7 @@
                else{
                    $("#divTimeInterval").show();
                    //接口为档案上传时
                    if($('#jobContentClass').ligerComboBox("getValue")==me.archiveUpload) {
                    if($('#jobContentClass').ligerComboBox("getValue")==me.archiveUpload  || $('#jobContentClass').ligerComboBox("getValue")==me.crawlerFlowUpload) {
                        $("#divDelayTime").show();
                        $("#divRepeat").hide();
                        $("#repeatStartTime").ligerDateEditor("setValue",model.repeatStartTime);
@@ -405,6 +418,7 @@
                }
                $('#txtSchemeId').val(model.schemeId);
                $('#txtSchemeVersion').val(model.schemeVersion);
                
                $('#txtCronExpression').val(model.cronExpression);
                $('#txtValid').val(model.valid);
                $("#dateNextTime").ligerDateEditor('setValue',model.jobNextTime);
@@ -453,12 +467,13 @@
        },
        //改变为档案上传接口，执行方式修改时触发,清空数据
        setAchiveUploadType:function(jobType){
            
            var me = this;
            if(jobType==undefined)
            {
                jobType = $('input[name="jobType"]').ligerRadio("getValue");
            }
            if($('#jobContentClass').ligerComboBox("getValue")!=me.archiveUpload) {
            if($('#jobContentClass').ligerComboBox("getValue")!=me.archiveUpload && $('#jobContentClass').ligerComboBox("getValue")!=me.crawlerFlowUpload) {
                $("#divDelayTime").hide();
                $("#divRepeatStart").hide();
                $("#divRepeatEnd").hide();
@@ -471,7 +486,7 @@
            {
                $("#divTimeInterval").hide();
                //接口为档案上传时
                if($('#jobContentClass').ligerComboBox("getValue")==me.archiveUpload) {
                if($('#jobContentClass').ligerComboBox("getValue")==me.archiveUpload || $('#jobContentClass').ligerComboBox("getValue")==me.crawlerFlowUpload) {
                    $("#divDelayTime").hide();
                    $("#divRepeatStart").show();
                    $("#divRepeatEnd").show();
@@ -481,7 +496,7 @@
            else{
                $("#divTimeInterval").show();
                //接口为档案上传时
                if($('#jobContentClass').ligerComboBox("getValue")==me.archiveUpload) {
                if($('#jobContentClass').ligerComboBox("getValue")==me.archiveUpload  || $('#jobContentClass').ligerComboBox("getValue")==me.crawlerFlowUpload) {
                    $("#divDelayTime").show();
                    $("#repeatEndTime").ligerDateEditor("setValue","");
                    $("#divRepeatStart").show();
@@ -508,6 +523,7 @@
        //设置数据集条件
        setCondition:function(rowIndex)
        {
            
            var me = this;
            //获取选中行
            var row = me.$listDataset.getRow(rowIndex);