Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js
===================================================================
diff -u -r33454 -r33455
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js	(.../customTousseForm.js)	(revision 33454)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js	(.../customTousseForm.js)	(revision 33455)
@@ -2,6 +2,10 @@
 var tousseId;
 var tousseWin;
 var toussePrice;
+//器械包列表
+var tousseDefinitionListHeight = 250;
+//器械包列表列宽
+var tousseLeaseColumnTreeColumn = [225, 190, 80, 80, 55, 55, 90, 55, 0]
 
 var customTousseDefinitionsStore = new Ext.data.Store({
 	proxy: new Ext.data.HttpProxy({
@@ -109,20 +113,20 @@
 		id: 'tousseLeaseColumnTree',
 		rootVisible: false,
 		autoScroll: true,
-		height: 250,
+		height: tousseDefinitionListHeight,
 		bodyStyle: 'border:1px solid #afd7af',
 		containerScroll: true,
 		columns: [{
 			header: '器械包名称',
-			width: 205,
+			width: tousseLeaseColumnTreeColumn[0],
 			dataIndex: 'tousseName'
 		}, {
 			header: '材料名称',
-			width: 170,
+			width: tousseLeaseColumnTreeColumn[1],
 			dataIndex: 'material'
 		}, {
 			header: '是否回收',
-			width: 80,
+			width: tousseLeaseColumnTreeColumn[2],
 			dataIndex: 'isRecycling',
 			renderer: function (v, p, record) {
 				if (!record.leaf) {
@@ -140,24 +144,24 @@
 			}
 		}, {
 			header: '是否植入物',
-			width: 80,
+			width: tousseLeaseColumnTreeColumn[3],
 			dataIndex: 'isImplant'
 		}, {
 			header: '数量',
-			width: 55,
+			width: tousseLeaseColumnTreeColumn[4],
 			dataIndex: 'amount'
 		}, {
 			header: '价格',
-			width: 55,
+			width: tousseLeaseColumnTreeColumn[5],
 			dataIndex: 'toussePrice'
 		}, {
 			header: '类型',
-			width: 90,
+			width: tousseLeaseColumnTreeColumn[6],
 			hidden: true,
 			dataIndex: 'type'
 		}, {
 			header: '删除',
-			width: 95,
+			width: tousseLeaseColumnTreeColumn[7],
 			dataIndex: 'deleteButton',
 			renderer: function (v, p, record) {
 				var str = "<img src=\"" + WWWROOT + "/images/web/stop.png\" onclick=\"var currentTab = getCurrentTab();currentTab.removeTousseLeaseItem2('" + record.fromTousse + "','" + record.material + "','" + record.tousseName + "')\" >";
@@ -660,8 +664,7 @@
 			autoScroll: true,
 			id: 'tousseDefinitionList',
 			title: '器械包列表',
-			height: 250,
-			//    		height : top.screen.height > 1000 ? 210 : 230,
+			height: tousseDefinitionListHeight,
 			layout: 'fit',
 			items: [
 				tousseLeaseColumnTree
@@ -704,17 +707,26 @@
 		items: [formAppObj]
 	});
 
+	var winWidth = 813;
+	var winHeight = 618;
+
 	tousseWin = new top.Ext.Window({
 		id: 'tousseWin',
 		layout: 'border',
 		title: '自定义器械包申请单信息',
 		border: false,
 		modal: true,
-		width: 720,
-		//		height : appId==null?400:575,
-		height: 600,
+		width: winWidth,
+		height: winHeight,
 		plain: true,
-		items: winItems
+		items: winItems,
+		listeners: {
+			resize: function (t, w, h) {
+				var widthRadio = parseFloat(w / winWidth).toFixed(2);
+				var heightRadio = parseFloat(h / winHeight).toFixed(2);
+				resizeWindow(widthRadio, heightRadio, 'tousseWin');
+			}
+		}
 	});
 	tousseWin.show();
 
Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r33453 -r33455
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 33453)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 33455)
@@ -4634,7 +4634,7 @@
 
 //重置窗口的大小
 function resizeWindow(widthRadio, heightRadio, windowId) {
-    if (windowId == 'washAndDisinfectRecordWin') {
+    if (windowId == 'washAndDisinfectRecordWin') {//清洗消毒
         //待清洗篮筐
         var pendingWashAndDisinfectWin = top.Ext.getCmp('pendingWashAndDisinfectWin');
         var pendingWashAndDisinfectParent = top.Ext.getCmp('pendingWashAndDisinfectParent');
@@ -4652,5 +4652,14 @@
         var washAndDisinfectMaterialGrid = top.Ext.getCmp('washAndDisinfectMaterialGrid');
         washAndDisinfectMaterialGrid.width = (washAndDisinfectMaterialWidth * widthRadio);
         washAndDisinfectMaterialGrid.height = (washAndDisinfectMaterialHeight * heightRadio);
+    } else if (windowId == 'tousseWin') {//申请自定义器械包
+        //器械包列表
+        var tousseDefinitionList = top.Ext.getCmp('tousseDefinitionList');
+        tousseDefinitionList.height = (tousseDefinitionListHeight * heightRadio + 257 * (heightRadio - 1));
+        var tousseLeaseColumnTree = top.Ext.getCmp('tousseLeaseColumnTree');
+        tousseLeaseColumnTree.height = (tousseDefinitionListHeight * heightRadio + 257 * (heightRadio - 1));
+        for (var i = 0; i < tousseLeaseColumnTree.columns.length; i++) {
+            tousseLeaseColumnTree.columns[i].width = parseInt(tousseLeaseColumnTreeColumn[i] * widthRadio);
+        }
     }
 }
\ No newline at end of file