Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r33536 -r33566
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 33536)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 33566)
@@ -11,7 +11,7 @@
 var pitchOn = true; //判断是否点击了责任人后扫描条码  true没修改， flase修改过
 var isAddorAlter = true; //判断是否是修改还是添加 true是添加，flase是修改
 //清洗记录窗口的大小
-var winWidth = top.screen.width > 1024 ? 1100 : 1000;;
+var winWidth = top.screen.width > 1024 ? 1100 : 1000;
 var winHeight = top.screen.height > 768 ? 660 : 600;
 //基础数据的宽高
 var fieldsetWidth = 710;
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js
===================================================================
diff -u -r31457 -r33566
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js	(.../interferewashAndDisinfectForm.js)	(revision 31457)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js	(.../interferewashAndDisinfectForm.js)	(revision 33566)
@@ -10,6 +10,20 @@
 var oldPersonCode = null; //修改时后台传过来的清洗责任人登录名
 var pitchOn = true; //判断是否点击了责任人后扫描条码  true没修改， flase修改过
 var isAddorAlter = true ; //判断是否是修改还是添加 true是添加，flase是修改
+//清洗记录窗口的大小
+var winWidth = top.screen.width > 1024 ? 1100 : 1000;
+var winHeight = top.screen.height > 768 ? 660 : 600;
+//基础数据的宽高
+var fieldsetWidth = 710;
+var fieldsetHeight;
+//清洗器械的宽高
+var washAndDisinfectMaterialWidth = 160;
+var washAndDisinfectMaterialHeight = 380;
+//清洗篮筐
+var basketTreePanelHeight = 380;
+//待清洗篮筐
+var pendingWashAndDisinfectWidth = 400;
+var pendingWashAndDisinfectHeight = 575;
 
 var materialDefinitionStore = new Ext.data.Store({
     pageSize: 100,
@@ -645,7 +659,7 @@
 		bodyStyle : 'border:1px solid #afd7af',
         autoScroll : true,
         containerScroll : true,
-        height : 380,
+        height : basketTreePanelHeight,
         title : washBasketTreePanelTitle,
         columns : [
             {header : '名称', width : 220,dataIndex : 'name'},
@@ -681,8 +695,8 @@
         autoScroll : true,
         containerScroll : false,
         title:'待清洗篮筐',
-        width:260,
-		height : 575,
+        width: pendingWashAndDisinfectWidth,
+		height: pendingWashAndDisinfectHeight,
         frame : false,
         bodyStyle : 'border:1px solid #afd7af',
         columns : [{
@@ -764,6 +778,7 @@
         })
     });
 //	pendingWashAndDisinfectColumnTree.loader.load(pendingWashAndDisinfectColumnTree.root,function(){});
+	fieldsetHeight = (!!window.ActiveXObject || "ActiveXObject" in window || window.navigator.userAgent.indexOf("MSIE") >= 1) ? 185 : 210;
 	
 	formObj = new top.Ext.FormPanel({
 		id : 'washForm',
@@ -777,14 +792,14 @@
 		items : [{
 			layout : 'column',
 			items : [{
-				columnWidth : 0.73,
+				columnWidth: top.screen.width > 1024 ? 0.64 : 0.6,
 				layout : 'column',
 				items : [{
 					xtype : "fieldset",
 					title : '基础数据',
 					layout:'column',
-					width:710,
-					height:185,
+					width: fieldsetWidth,
+					height: fieldsetHeight,
 					columnWidth : 1,
 //					autoHeight : true,
 					labelWidth : 95,
@@ -1161,20 +1176,20 @@
 						}]
 					}]
 				},{
-						columnWidth : .58,
+						columnWidth: top.screen.width > 1024 ? 0.58 : 0.5,
 						layout : 'fit',
 						items : basketTreePanel
 					},{
-						columnWidth : .42,
+						columnWidth: top.screen.width > 1024 ? 0.42 : 0.5,
 						layout : 'fit',
 						items : new top.Ext.grid.EditorGridPanel({
 							id : 'washAndDisinfectMaterialGrid',
 							title : '清洗器械',
 							bodyStyle : 'border:1px solid #afd7af',
 							store : materialStore,
 							cm : materialCm,
-							width : 160,
-							height : 380,
+							width: washAndDisinfectMaterialWidth,
+							height: washAndDisinfectMaterialHeight,
 							autoExpandColumn : 'deleteItem',
 							frame : false,
 							selModel : new top.Ext.grid.RowSelectionModel({
@@ -1239,7 +1254,7 @@
 						})
 					}]
 			},{
-				columnWidth : 0.27,
+				columnWidth: top.screen.width > 1024 ? 0.36 : 0.4,
 				layout : 'column',
 				items : [{
 					columnWidth : 1,
@@ -1304,9 +1319,8 @@
 		title : '干预清洗消毒记录',
 		modal : true,
 		border:false,
-		width : 1000,
-		height : top.screen.height > 800 ? 660 : 500,
-		// height : 660,
+		width : winWidth,
+		height : winHeight,
 		plain : true,
 		items : [ formObj ]
 	});