Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r33381 -r33452
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 33381)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 33452)
@@ -4630,4 +4630,33 @@
         );
         exportMask.hide();
     }
+}
+
+//重置窗口的大小
+function resizeWindow(widthRadio, heightRadio, windowId) {
+    if (windowId == 'washAndDisinfectRecordWin') {
+        //待清洗篮筐
+        var pendingWashAndDisinfectWin = top.Ext.getCmp('pendingWashAndDisinfectWin');
+        var pendingWashAndDisinfectParent = top.Ext.getCmp('pendingWashAndDisinfectParent');
+        pendingWashAndDisinfectWin.setWidth(pendingWashAndDisinfectWidth * widthRadio);
+        pendingWashAndDisinfectWin.setHeight(pendingWashAndDisinfectHeight * heightRadio);
+        pendingWashAndDisinfectParent.setHeight(pendingWashAndDisinfectHeight * heightRadio);
+        //基础数据
+        var fieldsetWin = top.Ext.getCmp('fieldsetWin');
+        fieldsetWin.setWidth(fieldsetWidth * widthRadio);
+        fieldsetWin.setHeight(fieldsetHeight * heightRadio);
+        //清洗篮筐
+        var basketTreePanel = top.Ext.getCmp('basketTreePanel');
+        basketTreePanel.setHeight(basketTreePanelHeight * heightRadio);
+        //清洗器械
+        var washAndDisinfectMaterialGrid = top.Ext.getCmp('washAndDisinfectMaterialGrid');
+        washAndDisinfectMaterialGrid.setWidth(washAndDisinfectMaterialWidth * widthRadio);
+        washAndDisinfectMaterialGrid.setHeight(washAndDisinfectMaterialHeight * heightRadio);
+        setTimeout(function () {
+            washAndDisinfectRecordWin.hide();
+        }, 10);
+        setTimeout(function () {
+            washAndDisinfectRecordWin.show();
+        }, 30);
+    }
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r33438 -r33452
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 33438)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 33452)
@@ -10,6 +10,17 @@
 var oldPersonCode = null; //修改时后台传过来的清洗责任人登录名
 var pitchOn = true; //判断是否点击了责任人后扫描条码  true没修改， flase修改过
 var isAddorAlter = true; //判断是否是修改还是添加 true是添加，flase是修改
+//基础数据的宽高
+var fieldsetWidth = 710;
+var fieldsetHeight;
+//清洗器械的宽高
+var washAndDisinfectMaterialWidth = 160;
+var washAndDisinfectMaterialHeight = 380;
+//清洗篮筐
+var basketTreePanelHeight = 380;
+//待清洗篮筐
+var pendingWashAndDisinfectWidth = 260;
+var pendingWashAndDisinfectHeight = 575;
 
 var materialDefinitionStore = new Ext.data.Store({
 	pageSize: 100,
@@ -691,7 +702,7 @@
 		bodyStyle: 'border:1px solid #afd7af',
 		autoScroll: true,
 		containerScroll: true,
-		height: 380,
+		height: basketTreePanelHeight,
 		title: washBasketTreePanelTitle,
 		columns: [
 			{ header: '名称', width: 220, dataIndex: 'name' },
@@ -724,12 +735,13 @@
 	 * 待清洗物品列表
 	 */
 	pendingWashAndDisinfectColumnTree = new top.Ext.tree.ColumnTree({
+		id: 'pendingWashAndDisinfectWin',
 		rootVisible: false,
 		autoScroll: true,
 		containerScroll: false,
 		title: '待清洗篮筐',
-		width: 260,
-		height: 575,
+		width: pendingWashAndDisinfectWidth,
+		height: pendingWashAndDisinfectHeight,
 		frame: false,
 		bodyStyle: 'border:1px solid #afd7af',
 		columns: [{
@@ -816,6 +828,8 @@
 	});
 	//	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',
 		frame: true,
@@ -834,10 +848,10 @@
 					xtype: "fieldset",
 					title: '基础数据',
 					layout: 'column',
-					width: 710,
-					height: (!!window.ActiveXObject || "ActiveXObject" in window || window.navigator.userAgent.indexOf("MSIE") >= 1) ? 185 : 210,
+					id: 'fieldsetWin',
+					width: fieldsetWidth,
+					height: fieldsetHeight,
 					columnWidth: 1,
-					//					autoHeight : true,
 					labelWidth: 95,
 					items: [{
 						layout: 'column',
@@ -1282,8 +1296,8 @@
 						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({
@@ -1356,6 +1370,7 @@
 					items: [{
 						layout: 'form',
 						columnWidth: 1,
+						id: 'pendingWashAndDisinfectParent',
 						items: [pendingWashAndDisinfectColumnTree]
 					}]
 				}]
@@ -1424,17 +1439,26 @@
 		}]
 	});
 
+	var winWidth = 1000;
+	var winHeight = top.screen.height > 800 ? 660 : 500;
+
 	washAndDisinfectRecordWin = new top.Ext.Window({
 		id: 'washAndDisinfectRecordWin',
 		layout: 'fit',
 		title: '清洗消毒记录',
 		modal: true,
 		border: false,
-		width: 1000,
-		height: top.screen.height > 800 ? 660 : 500,
-		// height : 660,
+		width: winWidth,
+		height: winHeight,
 		plain: true,
-		items: [formObj]
+		items: [formObj],
+		listeners: {
+			resize: function (t, w, h) {
+				var widthRadio = parseFloat(w / winWidth).toFixed(2);
+				var heightRadio = parseFloat(h / winHeight).toFixed(2);
+				resizeWindow(widthRadio, heightRadio,'washAndDisinfectRecordWin');
+			}
+		}
 	});
 	washAndDisinfectRecordWin.show();
 	washAndDisinfectRecordWin.on('close', function () {  //关闭窗口就清除定时器