Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js =================================================================== diff -u -r17445 -r17464 --- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js (.../directPacking.js) (revision 17445) +++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js (.../directPacking.js) (revision 17464) @@ -163,7 +163,7 @@ var tousseInstances = retObj.tousseInstances; var printNum = Ext.getCmp('tempPrintNum').getValue();//打印张数 var packageType = Ext.getCmp("packageType").getValue(); - var sterilingType = Ext.getCmp("sterilingType").getValue(); + var sterilingType = Ext.getCmp("sterilingType1").getValue(); var sterilizer = Ext.getCmp("sterilizer").getValue(); var frequency = Ext.getCmp("frequency").getValue(); var department = retObj.department; @@ -407,7 +407,7 @@ } function loadTousseInfo(id) { - Ext.getCmp('sterilingType').setValue(''); + Ext.getCmp('sterilingType1').setValue(''); Ext.getCmp('packageType').setValue(''); Ext.Ajax.request({ url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!loadTousseDefinition.do', @@ -418,7 +418,7 @@ if(tousseDefinition != null){ var sterilingType = tousseDefinition.sterilingMethod; var packageType = tousseDefinition.packageType; - Ext.getCmp('sterilingType').setValue(sterilingType); + Ext.getCmp('sterilingType1').setValue(sterilingType); Ext.getCmp('packageType').setValue(packageType); } }, @@ -728,7 +728,7 @@ triggerAction : 'all', mode : "local", name : "sterilingType", - id : "sterilingType", + id : "sterilingType1", anchor : '100%', allowBlank : sstsConfig.hideSterilingType }] @@ -918,7 +918,7 @@ anchor : '100%', listeners : { select : function(combo, record, index) { - var sterilizerTypeObj = Ext.getCmp("sterilingType").getValue(); + var sterilizerTypeObj = Ext.getCmp("sterilingType1").getValue(); var reset = false; SterilizationRecordTableManager.getSterilisationAndMaxFrequencyMap(combo.value,0,function(map){ var sterilizerTypeData = new Array(); @@ -944,7 +944,7 @@ sterilizerTypeStore.loadData(sterilizerTypeData); Ext.getCmp('frequency').setValue(frequency); if(reset){ - Ext.getCmp("sterilingType").setValue(""); + Ext.getCmp("sterilingType1").setValue(""); } }); } @@ -1132,7 +1132,7 @@ var packageType = Ext.getCmp("packageType").getValue(); //灭菌程序 - var sterilingType = Ext.getCmp("sterilingType").getValue(); + var sterilingType = Ext.getCmp("sterilingType1").getValue(); //器械包 var tousseName = Ext.getCmp("tousseName").getValue(); //灭菌炉 @@ -1177,6 +1177,7 @@ formObj.form.submit({ url : WWWROOT + '/disinfectSystem/packingAction!packingWithoutTask.do', method : 'POST', + params : {sterilingType : sterilingType}, timeout : 1800000, // 单位为毫秒,设定超时时间为30分钟 waitMsg : '正在后台进行处理,请稍候', waitTitle : '提交表单',