Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js =================================================================== diff -u -r25308 -r25318 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js (.../sterilizationRecordInfoView.js) (revision 25308) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js (.../sterilizationRecordInfoView.js) (revision 25318) @@ -8,7 +8,6 @@ {name : 'name'} ] }); -//20190103 // 申请科室Store var sendDepartJsonStore = new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ @@ -23,14 +22,13 @@ ] ) }); - -//20190103 //灭菌炉分组 var sterilizerNameGroupJsonStore = new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ - url : WWWROOT + '/disinfectSystem/core/httpOptionAction!getHttpOptionsById.do?optionId=sterilerGroup', + url : WWWROOT + '/disinfectSystem/core/httpOptionAction!getHttpOptionsById.do', method : 'POST' }), + baseParams :{optionId : "sterilerGroup"}, reader : new Ext.data.JsonReader({ root : 'data', },[ @@ -59,7 +57,6 @@ var myMask; Ext.onReady(function() { Ext.QuickTips.init(); - //20181225 var supplyRoomRecord = Ext.data.Record.create([ {name: 'departCode', type: 'string'}, {name: 'name', type: 'string'} @@ -121,14 +118,13 @@ } } }); - //20181225 end // 记录cookie(3步) function reloadReport(){ var startDate = $Id('startDate').value; var endDate = $Id('endDate').value; var sterilizerName = Ext.getCmp('sterilizerName').getValue(); var sterilizerNameGroup = Ext.getCmp('sterilizerNameGroup').getValue(); - if(sterilizerNameGroup!=""){ + if(sterilizerNameGroup != ""){ sterilizerName = Ext.getCmp('sterilizerNameGroupValue').getValue(); } var querySupplyRoom = Ext.getCmp('querySupplyRoom').getValue(); @@ -151,7 +147,13 @@ * 所以这里改成了post方式提交 * */ - + + if(sstsConfig.sterilizationRecordInfoReportOrder){ + var newOrder = ''; + } + else{ + var newOrder = ""; + } var newWindow = window.open('', 'thisIframe', '_self'); var url = WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do"; formString = '
' @@ -160,7 +162,8 @@ +'' +'' +'' - +'' + + newOrder + +'' +'' +'' +'
'; @@ -252,7 +255,7 @@ height : 140, items : [{ layout : 'column', - height : 100,//60, + height : 100, labelWidth : 70, items : [{ columnWidth : .2, @@ -309,7 +312,7 @@ layout : 'form', labelWidth : 70, labelSeparator : '选择供应室:', - items : [{//20181225 + items : [{ xtype : 'multiSelect', id : 'querySupplyRoom', name : 'querySupplyRoom', @@ -411,9 +414,8 @@ } } }), - listeners: { - select:function(combo, record, index){ - var ab =record.get("sterilizerName"); + listeners : { + select : function(combo, record, index){ Ext.getCmp('sterilizerNameGroup').setValue(""); } }, @@ -443,8 +445,8 @@ fieldLabel : "灭菌炉分组", valueField : 'sterilizerNameGroup', displayField : 'sterilizerNameGroup', - listeners: { - select:function(combo, record, index){ + listeners : { + select : function(combo, record, index){ Ext.getCmp('sterilizerName').setValue(""); var sname = record.data.sterilizerNameGroup; //ajax获取数据 @@ -460,7 +462,7 @@ var str=''; var sterilizerNameGroup = response.responseText; for(var i=0;i - +