Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r33464 -r33472
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 33464)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 33472)
@@ -1,10 +1,21 @@
 var entityName = "发货单";
 var grid;
 var tousseTypeDataArray = [['全部', '全部'], ['一次性物品', '一次性物品'], ['器械包', '器械包'], ['敷料包', '敷料包'], ['消毒物品', '消毒物品'], ['自定义器械包', '自定义器械包'], ['外来器械包', '外来器械包'], ['外来器械拆分小包', '外来器械拆分小包'], ['外部代理灭菌', '外部代理灭菌']];
+//基础信息
+var recyclingApplicationFormWidth = 1000;
+var recyclingApplicationFormHeight = 620;
+var recyclingApplicationInfoWidth = 950;
 
 //预约或者自定义下的病人信息的显示与否
 var isPatient = false;
+var isPatientWidth = 425;
 var isPatientHeight = 140;
+//发货器械包
+var recyclingGrid2Width = 620;
+var recyclingGrid2Height = 385;
+//发货单明细
+var recyclingGrid1Width = 350;
+var recyclingGrid1Height = 385;
 
 var rd = new Ext.data.JsonReader({
 	fields: [
@@ -630,16 +641,17 @@
 		frame: true,
 		labelSeparator: '：',
 		bodyStyle: 'padding:5px 5px 0px 5px',
-		width: 1000,
-		height: 620,
-		// autoHeight : true,
+		width: recyclingApplicationFormWidth,
+		height: recyclingApplicationFormHeight,
 		autoScroll: true,
 		labelAlign: 'right',
 		layout: 'form',
 		items: [{
 			xtype: "fieldset",
 			title: "基础数据",
 			layout: 'column',
+			id: 'recyclingApplicationInfo',
+			width: recyclingApplicationInfoWidth,
 			autoHeight: true,
 			items: [{
 				layout: 'column',
@@ -929,7 +941,7 @@
 						store: recyclingErrorStore,
 						cm: recyclingErrorCm,
 						enableHdMenu: false,
-						width: 405,
+						width: isPatientWidth,
 						height: isPatientHeight,
 						autoExpandColumn: 'price',
 						frame: false,
@@ -953,8 +965,8 @@
 						id: 'recyclingGrid2',
 						store: tousseInstanceStore,
 						cm: cm,
-						width: 620,
-						height: 385,
+						width: recyclingGrid2Width,
+						height: recyclingGrid2Height,
 						autoExpandColumn: 'deleteItem',
 						enableHdMenu: false,
 						frame: false,
@@ -975,8 +987,8 @@
 						store: invoiceStore,
 						cm: recyclingapplicationCm,
 						enableHdMenu: false,
-						width: 350,
-						height: 385,
+						width: recyclingGrid1Width,
+						height: recyclingGrid1Height,
 						autoExpandColumn: 'deleteItem',
 						frame: false,
 						bodyStyle: 'border:1px solid #afd7af',
@@ -1019,20 +1031,31 @@
 		}]
 	});
 
+	var winWidth = 1000;
+	var winHeight = top.screen.height > 800 ? 700 : 500;
+
 	var window = new top.Ext.Window({
 		id: 'recyclingApplicationWin',
 		layout: 'fit',
 		title: '发货单',
-		width: 1000,
-		height: top.screen.height > 800 ? 700 : 500,
+		width: winWidth,
+		height: winHeight,
+		minWidth: winWidth,
+		minHeight: winHeight,
 		border: false,
 		modal: true,
 		plain: true,
-		items: [form]
+		items: [form],
+		listeners: {
+			resize: function (t, w, h) {
+				var widthRadio = parseFloat(w / winWidth).toFixed(2);
+				var heightRadio = parseFloat(h / winHeight).toFixed(2);
+				resizeWindow(widthRadio, heightRadio, 'recyclingApplicationWin');
+			}
+		}
 	});
 
 	window.show();
-	//top.Ext.getCmp('depart1').focus(false, 100);
 
 	form.form.load({
 		url: WWWROOT + '/disinfectSystem/invoiceAction!loadInvoice.do',