Index: ssts-web/src/main/webapp/homepage/supplyRoomOperate.jsp
===================================================================
diff -u -r28884 -r29279
--- ssts-web/src/main/webapp/homepage/supplyRoomOperate.jsp	(.../supplyRoomOperate.jsp)	(revision 28884)
+++ ssts-web/src/main/webapp/homepage/supplyRoomOperate.jsp	(.../supplyRoomOperate.jsp)	(revision 29279)
@@ -9,7 +9,8 @@
 <script type="text/javascript">
 window.JSON ||
 document.write('<script type="text/javascript" src="${ctx}/ext/js/json3.min.js"/>');
-
+//设置的字体对比标准字体的大小比例,用于每个grid的列宽自动乘上此比例系数
+var fontSizeScale = parseInt('${fontSize}')/12;
 </script>
 <script type="text/javascript" src="${ctx}/js/common.js" ></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
@@ -42,6 +43,7 @@
 	<operation:authorize ifAnyGranted="SSTS_View_All_Supply_Room_Report">
 		SSTS_View_All_Supply_Room_Report = false;
 	</operation:authorize>
+
 </script>
 <title>消毒供应中心运作监控管理</title>
 </head>
Index: ssts-web/src/main/webapp/homepage/supplyRoomUnfinishedWork.jsp
===================================================================
diff -u -r28884 -r29279
--- ssts-web/src/main/webapp/homepage/supplyRoomUnfinishedWork.jsp	(.../supplyRoomUnfinishedWork.jsp)	(revision 28884)
+++ ssts-web/src/main/webapp/homepage/supplyRoomUnfinishedWork.jsp	(.../supplyRoomUnfinishedWork.jsp)	(revision 29279)
@@ -104,6 +104,8 @@
 	if(sstsConfig.enableGoodsReservateion){
 		applyFormTypeArr.push('<%=InvoicePlan.TYPE_GOODS_RESERVATION_FORM%>');
 }
+	//设置的字体对比标准字体的大小比例,用于每个grid的列宽自动乘上此比例系数
+	var fontSizeScale = parseInt('${fontSize}')/12;
 </script>
 <style>
 	.task-folder {
Index: ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
===================================================================
diff -u -r28872 -r29279
--- ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 28872)
+++ ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 29279)
@@ -27,6 +27,8 @@
 var IDS = Ext.id();
 var defaultWidth = window.screen.width >= 1366 ? 280:240;
 var formHeight = window.screen.width >= 1280 ? 150:170;
+// 每个环节的grid的高度
+var gridHeight = 350 * fontSizeScale;
 
 /*
  *IE8以下兼容document.getElementsByClassName
@@ -939,17 +941,17 @@
 				return '';
 			}
 		}},
-		{ header: "器械包名称", width: 180, dataIndex: 'tousseName'},
-		{ header: "申请数量", width: 60, dataIndex: 'amount' },
-		{ header: "回收数量", width: 60, dataIndex: 'recyclingAmount' },
-		{ header: "回收清洗筐", width: 140, dataIndex: 'basketName' },
-		{ header: "加急数量", width: 60, dataIndex: 'urgentAmount', hidden: !sstsConfig.enableUrgentFunction },
-		{ header: "发货数量", width: 60, dataIndex: 'sendOutAmount' },
-		{ header: "科室", width: 110, dataIndex: 'depart' },
-		{ header: "回收时间", width: 130, dataIndex: 'recyclingTime' },
-		{ header: "申请时间", width: 130, dataIndex: 'applicationTime' },
-		{ header: "提交时间", width: 130, dataIndex: 'submitTime' },
-		{ header: "打印时间", width: 130, dataIndex: 'printTime' },
+		{ header: "器械包名称", width: 180 * fontSizeScale, dataIndex: 'tousseName'},
+		{ header: "申请数量", width: 60 * fontSizeScale, dataIndex: 'amount' },
+		{ header: "回收数量", width: 60 * fontSizeScale, dataIndex: 'recyclingAmount' },
+		{ header: "回收清洗筐", width: 140 * fontSizeScale, dataIndex: 'basketName' },
+		{ header: "加急数量", width: 60 * fontSizeScale, dataIndex: 'urgentAmount', hidden: !sstsConfig.enableUrgentFunction },
+		{ header: "发货数量", width: 60 * fontSizeScale, dataIndex: 'sendOutAmount' },
+		{ header: "科室", width: 110 * fontSizeScale, dataIndex: 'depart' },
+		{ header: "回收时间", width: 130 * fontSizeScale, dataIndex: 'recyclingTime' },
+		{ header: "申请时间", width: 130 * fontSizeScale, dataIndex: 'applicationTime' },
+		{ header: "提交时间", width: 130 * fontSizeScale, dataIndex: 'submitTime' },
+		{ header: "打印时间", width: 130 * fontSizeScale, dataIndex: 'printTime' },
 		{ header: "备注", width: sstsConfig.enableUrgentFunction?410:470, dataIndex: 'remark', id: 'autoWidth' },
 		{ width: 18}
 	];
@@ -965,14 +967,14 @@
 				return '';
 			}
 		}},
-		{ header: "器械包/材料名称", width: 150, dataIndex: 'tousseName' },
-		{ header: "器械件数", width: 60, dataIndex: 'amount'},
-		{ header: "回收清洗筐", width: 90, dataIndex: 'basketName' },
-		{ header: "清洗人", width: 60, dataIndex: 'operator'},
-		{ header: "清洗机", width: 80, dataIndex: 'disinfectIdentification'},
-		{ header: "清洗程序", width: 80, dataIndex: 'disinfectProgram'},
-		{ header: "开始时间", width: 130, dataIndex: 'startDate'},
-		{ header: "结束时间", width: 130, dataIndex: 'endDate'},
+		{ header: "器械包/材料名称", width: 150 * fontSizeScale, dataIndex: 'tousseName' },
+		{ header: "器械件数", width: 60 * fontSizeScale, dataIndex: 'amount'},
+		{ header: "回收清洗筐", width: 90 * fontSizeScale, dataIndex: 'basketName' },
+		{ header: "清洗人", width: 60 * fontSizeScale, dataIndex: 'operator'},
+		{ header: "清洗机", width: 80 * fontSizeScale, dataIndex: 'disinfectIdentification'},
+		{ header: "清洗程序", width: 80 * fontSizeScale, dataIndex: 'disinfectProgram'},
+		{ header: "开始时间", width: 130 * fontSizeScale, dataIndex: 'startDate'},
+		{ header: "结束时间", width: 130 * fontSizeScale, dataIndex: 'endDate'},
 		{ width: 18}
 	];
 	//装配记录信息
@@ -987,10 +989,10 @@
 				return '';
 			}
 		}},
-		{ header: "器械包名称", width: 400, dataIndex: 'tousseName' },
-		{ header: "数量", width: 100, dataIndex: 'amount' },
-		{ header: "装配人", width: 140, dataIndex: 'operator' },
-		{ header: "装配时间", width: 130, dataIndex: 'applicationTime' },
+		{ header: "器械包名称", width: 400 * fontSizeScale, dataIndex: 'tousseName' },
+		{ header: "数量", width: 100 * fontSizeScale, dataIndex: 'amount' },
+		{ header: "装配人", width: 140 * fontSizeScale, dataIndex: 'operator' },
+		{ header: "装配时间", width: 130 * fontSizeScale, dataIndex: 'applicationTime' },
 		{ width: 18}
 	];
 	//审核信息
@@ -1005,11 +1007,11 @@
 				return '';
 			}
 		}},
-		{ header: "器械包名称", width: 300, dataIndex: 'tousseName' },
-		{ header: "数量", width: 120, dataIndex: 'amount' },
-		{ header: "灭菌筐", width: 120, dataIndex: 'basketName' },
-		{ header: "" + reviewViewText + "人", width: 100, dataIndex: 'operator' },
-		{ header: "" + reviewViewText + "时间", width: 130, dataIndex: 'applicationTime' },
+		{ header: "器械包名称", width: 300 * fontSizeScale, dataIndex: 'tousseName' },
+		{ header: "数量", width: 120 * fontSizeScale, dataIndex: 'amount' },
+		{ header: "灭菌筐", width: 120 * fontSizeScale, dataIndex: 'basketName' },
+		{ header: "" + reviewViewText + "人", width: 100 * fontSizeScale, dataIndex: 'operator' },
+		{ header: "" + reviewViewText + "时间", width: 130 * fontSizeScale, dataIndex: 'applicationTime' },
 		{ width: 18}
 	];
 	//灭菌信息
@@ -1024,15 +1026,15 @@
 				return '';
 			}
 		}},
-		{ header: "器械包名称", width: 100, dataIndex: 'tousseName' },
-		{ header: "数量", width: 50, dataIndex: 'amount' },
-		{ header: "灭菌筐", width: 80, dataIndex: 'basketName' },
-		{ header: "灭菌员", width: 80, dataIndex: 'operator' },
-		{ header: "灭菌炉", width: 80, dataIndex: 'disinfectIdentification' },
-		{ header: "炉次", width: 50, dataIndex: 'frequency' },
-		{ header: "灭菌程序", width: 70, dataIndex: 'disinfectProgram' },
-		{ header: "开始时间", width: 130, dataIndex: 'startDate' },
-		{ header: "结束时间", width: 130, dataIndex: 'endDate' },
+		{ header: "器械包名称", width: 100 * fontSizeScale, dataIndex: 'tousseName' },
+		{ header: "数量", width: 50 * fontSizeScale, dataIndex: 'amount' },
+		{ header: "灭菌筐", width: 80 * fontSizeScale, dataIndex: 'basketName' },
+		{ header: "灭菌员", width: 80 * fontSizeScale, dataIndex: 'operator' },
+		{ header: "灭菌炉", width: 80 * fontSizeScale, dataIndex: 'disinfectIdentification' },
+		{ header: "炉次", width: 50 * fontSizeScale, dataIndex: 'frequency' },
+		{ header: "灭菌程序", width: 70 * fontSizeScale, dataIndex: 'disinfectProgram' },
+		{ header: "开始时间", width: 130 * fontSizeScale, dataIndex: 'startDate' },
+		{ header: "结束时间", width: 130 * fontSizeScale, dataIndex: 'endDate' },
 		{ width: 18}
 	];
 	//器械包发货信息(GGSRMYY-101 消毒供应中心运作监控，发货信息列表将一次性物品和器械包分开显示)
@@ -1047,11 +1049,11 @@
 				return '';
 			}
 		}},
-		{ header: "器械包名称", width: 330, dataIndex: 'tousseName' },
-		{ header: "数量", width: 50, dataIndex: 'amount' },
-		{ header: "发货员", width: 100, dataIndex: 'sender' },
-		{ header: "发货时间", width: 130, dataIndex: 'senderTime' },
-		{ header: "发往科室", width: 160, dataIndex: 'depart' },
+		{ header: "器械包名称", width: 330 * fontSizeScale, dataIndex: 'tousseName' },
+		{ header: "数量", width: 50 * fontSizeScale, dataIndex: 'amount' },
+		{ header: "发货员", width: 100 * fontSizeScale, dataIndex: 'sender' },
+		{ header: "发货时间", width: 130 * fontSizeScale, dataIndex: 'senderTime' },
+		{ header: "发往科室", width: 160 * fontSizeScale, dataIndex: 'depart' },
 		{ width: 18}
 	];
 
@@ -1067,11 +1069,11 @@
 				return '';
 			}
 		}},
-		{ header: "一次性物品名称", width: 330, dataIndex: 'tousseName' },
-		{ header: "数量", width: 50, dataIndex: 'amount' },
-		{ header: "发货员", width: 100, dataIndex: 'sender' },
-		{ header: "发货时间", width: 130, dataIndex: 'senderTime' },
-		{ header: "发往科室", width: 160, dataIndex: 'depart' },
+		{ header: "一次性物品名称", width: 200 * fontSizeScale, dataIndex: 'tousseName' },
+		{ header: "数量", width: 70 * fontSizeScale, dataIndex: 'amount' },
+		{ header: "发货员", width: 50 * fontSizeScale, dataIndex: 'sender' },
+		{ header: "发货时间", width: 130 * fontSizeScale, dataIndex: 'senderTime' },
+		{ header: "发往科室", width: 150 * fontSizeScale, dataIndex: 'depart' },
 		{ width: 18}
 	];
 	pageFunction = function(gridId){
@@ -1222,7 +1224,7 @@
 		rootVisible: false,
 		autoScroll: true,
 		title: '回收申请信息',
-		height: 350,
+		height: gridHeight,
 		frame: false,
 		id: 'applicationGrid',
 		columns: applicationColumns,
@@ -1256,7 +1258,7 @@
 		rootVisible: false,
 		autoScroll: true,
 		title: '清洗记录信息',
-		height: 350,
+		height: gridHeight,
 		frame: false,
 		id: 'washGrid',
 		columns: washColumns,
@@ -1290,7 +1292,7 @@
 		autoScroll: true,
 		title: '装配信息',
 		width: '100%',
-		height: 350,
+		height: gridHeight,
 		frame: false,
 		id: 'packingGrid',
 		columns: packingColumns,
@@ -1324,7 +1326,7 @@
 		autoScroll: true,
 		title: '' + reviewViewText + '信息',
 		width: '100%',
-		height: 350,
+		height: gridHeight,
 		frame: false,
 		id: 'reviewGrid',
 		columns: reviewColumns,
@@ -1358,7 +1360,7 @@
 		autoScroll: true,
 		title: '灭菌信息',
 		width: '100%',
-		height: 350,
+		height: gridHeight,
 		frame: false,
 		id: 'sterilizationGrid',
 		columns: sterilizationColumns,
@@ -1394,7 +1396,7 @@
 		autoScroll: true,
 		title: '发货信息',
 		width: '100%',
-		height: 350,
+		height: gridHeight,
 		frame: false,
 		id: 'tousseInvoiceGrid',
 		bbar:pageFunction('tousseInvoiceGrid'),
@@ -1430,7 +1432,7 @@
 		autoScroll: true,
 		title: '一次性物品发货信息',
 		width: '100%',
-		height: 350,
+		height: gridHeight,
 		frame: false,
 		id: 'disposableInvoiceGrid',
 		columns: disposableInvoiceColumns,
@@ -1473,33 +1475,33 @@
 			items: [{
 				columnWidth: 1,
 				layout: 'form',
-				height: 350,
+				height: gridHeight,
 				items: [applicationGrid]
 			}]
 		}, {
 			layout: 'column',
 			items: [{
 				columnWidth: .5,
 				layout: 'form',
-				height: 350,
+				height: gridHeight,
 				items: [washGrid]
 			}, {
 				columnWidth: .5,
 				layout: 'form',
-				height: 350,
+				height: gridHeight,
 				items: [packingGrid]
 			}]
 		}, {
 			layout: 'column',
 			items: [{
 				columnWidth: .5,
 				layout: 'form',
-				height: 350,
+				height: gridHeight,
 				items: [reviewGrid]
 			}, {
 				columnWidth: .5,
 				layout: 'form',
-				height: 350,
+				height: gridHeight,
 				items: [sterilizationGrid]
 			}]
 		}, {
@@ -1508,11 +1510,11 @@
 			items: [{
 				columnWidth: .5,
 				layout: 'form',
-				height: 350,
+				height: gridHeight,
 				items: [tousseInvoiceGrid]
 			}, {
 				columnWidth: .5,
-				height: 350,
+				height: gridHeight,
 				layout: 'form',
 				items: [disposableInvoiceGrid]
 			}]
Index: ssts-web/src/main/webapp/homepage/supplyRoomsUnfinishedWork.js
===================================================================
diff -u -r28761 -r29279
--- ssts-web/src/main/webapp/homepage/supplyRoomsUnfinishedWork.js	(.../supplyRoomsUnfinishedWork.js)	(revision 28761)
+++ ssts-web/src/main/webapp/homepage/supplyRoomsUnfinishedWork.js	(.../supplyRoomsUnfinishedWork.js)	(revision 29279)
@@ -13,6 +13,8 @@
 if(sstsConfig.nameSchemeOfReviewModule == 2){
 	reviewViewText = "包装";
 }
+var defaultWidth = window.screen.width >= 1366 ? 280:240;
+var formHeight = 120;
 
 function renderCallRecyclingApplicationShowFun(v, p, record){
 	if(record.data['diposable'] == '否'){
@@ -147,7 +149,7 @@
 		var h = time.getHours();
 		var mm = time.getMinutes();
 		var s = time.getSeconds();
-		return y+'-'+add0(m)+'-'+add0(d)+' '+add0(h)+':'+add0(mm)
+		return y+'-'+add0(m)+'-'+add0(d)+' '+add0(h)+':'+add0(mm)+':'+add0(s)
 	}
 }
 
@@ -416,15 +418,15 @@
 			border : 0,
 			frame : true,
 			bodyStyle : 'padding:0px auto;margin:0px',// padding:1px;padding-top:5px;
-			height : 103,
+			height : formHeight,
 			items : [{
 				id:"tousseType",
 				name:"tousseType",
 				xtype : 'hidden'
 			},{
 				layout : 'column',
-				height : 40,
-				labelWidth : 70,
+				height : 51,
+				labelWidth : 130,
 				items : [/*{
 					columnWidth : .3,
 					layout : 'form',
@@ -454,7 +456,7 @@
 						}
 					}]
 				},*/{
-					columnWidth : .2,
+					width: defaultWidth,
 					layout : 'form',
 					labelWidth : 60,
 					items : [{
@@ -482,9 +484,9 @@
 					}]
 				
 				},{
-					columnWidth : .2,
+					width: defaultWidth,
 					layout : 'form',
-					labelWidth : 70,
+					labelWidth : 85,
 					//labelSeparator : '选择供应室:',
 					items : [{//20181225
 						xtype : 'multiSelect',
@@ -563,77 +565,77 @@
 		var applicationSm = new Ext.grid.CheckboxSelectionModel();
 	    var applicationColumns = new Ext.grid.ColumnModel([
 	        applicationSm,                              
-			{header : "流水号",width : 75,dataIndex : 'serialNumber'}, 
-			{header : "申请人",width : 60,dataIndex : 'applicant'},
-			{header : "申请时间",width : 110,dataIndex : 'applicationTime', renderer : myDateFormatByMinute}, 
-			{header : "提交时间",width : 110,dataIndex : 'submitTime', renderer : myDateFormatByMinute}, 
-			{header : "打印时间",width : 110,dataIndex : 'printTime', renderer : myDateFormatByMinute}, 
-			{header : "类型",width : 160,dataIndex : 'type'},
-			{header : "已提交",width : 75,dataIndex : 'committedStatus',renderer : renderStatus},
-			{header : "已打印",width : 75,dataIndex : 'printed',renderer : renderPrintStatu}, 
-			{header : "科室",width : 120,dataIndex : 'depart'}, 
-			{header : "回收状态",width : 65,dataIndex : 'recyclingStatus'},
-			{header : "发货状态",width : 65,dataIndex : 'deliverStatus'}
+			{header : "流水号",width : 70 * fontSizeScale,dataIndex : 'serialNumber'}, 
+			{header : "科室",width : 130 * fontSizeScale,dataIndex : 'depart'},
+			{header : "申请时间",width : 130 * fontSizeScale,dataIndex : 'applicationTime'}, 
+			{header : "提交时间",width : 130 * fontSizeScale,dataIndex : 'submitTime'}, 
+			{header : "打印时间",width : 130 * fontSizeScale,dataIndex : 'printTime'}, 
+			{header : "已打印",width : 46 * fontSizeScale,dataIndex : 'printed',renderer : renderPrintStatu}, 
+			//{header : "已提交",width : 46 * fontSizeScale,dataIndex : 'committedStatus',renderer : renderStatus},
+			{header : "回收状态",width : 65 * fontSizeScale,dataIndex : 'recyclingStatus'},
+			{header : "发货状态",width : 65 * fontSizeScale,dataIndex : 'deliverStatus'},
+			{header : "申请类型",width : 90 * fontSizeScale,dataIndex : 'type'},
+			{header : "申请人",width : 50 * fontSizeScale,dataIndex : 'applicant'}
 	    ]);
 	    //	    待清洗篮筐信息
 	    var pendingBasketColumns = new Ext.grid.ColumnModel([
-			{header : "篮筐条码",width : 200,dataIndex : 'containerBarcode'},
-			{header : "名称",width : 200,dataIndex : 'containerName'},
-			{header : "待清洗物品数量",width : 120,dataIndex : 'unWashAmount'},
-			{header : "回收时间",width : 130,dataIndex : 'recyclingTime',renderer : renderRecyclingTime}
+			{header : "篮筐条码",width : 90 * fontSizeScale,dataIndex : 'containerBarcode'},
+			{header : "名称",width : 200 * fontSizeScale,dataIndex : 'containerName'},
+			{header : "待清洗物品数量",width : 110 * fontSizeScale,align : "right",dataIndex : 'unWashAmount'},
+			{header : "回收时间",width : 130 * fontSizeScale,dataIndex : 'recyclingTime',renderer : renderRecyclingTime}
 	    ]);
 	    //	    装配记录信息
 	    var packingSm = new Ext.grid.CheckboxSelectionModel();
 	    var packingColumns = new Ext.grid.ColumnModel([
 	        packingSm,
-			{header : "物品名称",width : 200,dataIndex : 'tousseDefinition.name'},
+			{header : "物品名称",width : 160 * fontSizeScale,dataIndex : 'tousseDefinition.name'},
 			{header : "篮筐名称",width : 150,dataIndex : 'recyclingBasketName'},
-			{header : "篮筐条码",width : 120,dataIndex : 'basketBarcode'},
-			{header : "任务组",width : 95,dataIndex : 'tousseDefinition.taskGroup'},
-			{header : "数量",width : 60,dataIndex : 'amount'},
-			{header : "待装配数量",width : 80,dataIndex : 'unPackAmount'},
-			{header : "开始时间",width : 120,dataIndex : 'startTime', renderer : myDateFormatByMinute},
-			{header : "状态",width : 60,dataIndex : 'status'}
+			{header : "篮筐条码",width : 80 * fontSizeScale,dataIndex : 'basketBarcode'},
+			{header : "任务组",width : 95 * fontSizeScale,dataIndex : 'tousseDefinition.taskGroup'},
+			{header : "数量",width : 40 * fontSizeScale,align : "center",dataIndex : 'amount'},
+			{header : "待装配数量",width : 70 * fontSizeScale,align : "center",dataIndex : 'unPackAmount'},
+			{header : "开始时间",width : 130 * fontSizeScale,dataIndex : 'startTime'},
+			{header : "状态",width : 60 * fontSizeScale,dataIndex : 'status'}
 	    ]);
 	    //审核信息
 	    var reviewSm = new Ext.grid.CheckboxSelectionModel();
 	    var reviewColumns = new Ext.grid.ColumnModel([
 	         reviewSm,
-			 {header : "物品名称",width : 160,dataIndex : 'tousseName',sortable:false},
-			 {header : "任务组",width : 95,dataIndex : 'tousseDefinition.taskGroup',sortable:false},
-		     {header : "条码",width : 65,dataIndex : 'barcode',sortable:false},
-		     {header : "装配人",width : 50,dataIndex : 'operator',sortable:false},
-		     {header : "装配时间",width : 120,dataIndex : 'operationTime', renderer : myDateFormatByMinute,sortable:false},
-		     {header : "灭菌程序",width : 100,dataIndex : 'sterilingType',sortable:false},
-		     {header : "有效期至",width : 80,dataIndex : 'validUntil', renderer : myDateFormat,sortable:false},
-		     {header : "状态",width : 50,dataIndex : 'status',sortable:false},
-		     {header : "包装类型",width : 60,dataIndex : 'packageType',sortable:false}
+			 {header : "物品名称",width : 160 * fontSizeScale,dataIndex : 'tousseName',sortable:false},
+			 {header : "任务组",width : 95 * fontSizeScale,dataIndex : 'tousseDefinition.taskGroup',sortable:false},
+		     {header : "条码",width : 65 * fontSizeScale,dataIndex : 'barcode',sortable:false},
+		     {header : "装配人",width : 50 * fontSizeScale,dataIndex : 'operator',sortable:false},
+		     {header : "装配时间",width : 130 * fontSizeScale,dataIndex : 'operationTime',sortable:false},
+		     {header : "灭菌程序",width : 100 * fontSizeScale,dataIndex : 'sterilingType',sortable:false},
+		     {header : "有效期至",width : 80 * fontSizeScale,dataIndex : 'validUntil', renderer : myDateFormat,sortable:false},
+		     {header : "状态",width : 50 * fontSizeScale,dataIndex : 'status',sortable:false},
+		     {header : "包装类型",width : 60 * fontSizeScale,dataIndex : 'packageType',sortable:false}
 	    ]);
 	    //灭菌信息
 	    var SterilizationSm = new Ext.grid.CheckboxSelectionModel();
 	    var SterilizationColumns = new Ext.grid.ColumnModel([
 	         SterilizationSm,
-             {header : "物品名称",width : 130,dataIndex : 'tousseName',sortable:false},
-		     {header : "条码",width : 65,dataIndex : 'barcode',sortable:false},
-		     {header : "审核人",width : 50,dataIndex : 'operator',sortable:false},
-		     {header : "审核时间",width : 120,dataIndex : 'operationTime', renderer : myDateFormatByMinute,sortable:false},
-		     {header : "灭菌程序",width : 100,dataIndex : 'sterilingType',sortable:false},
-		     {header : "有效期至",width : 80,dataIndex : 'validUntil', renderer : myDateFormat,sortable:false},
-		     {header : "状态",width : 50,dataIndex : 'status',sortable:false},
-		     {header : "包装类型",width : 60,dataIndex : 'packageType',sortable:false}
+             {header : "物品名称",width : 120 * fontSizeScale,dataIndex : 'tousseName',sortable:false},
+		     {header : "条码",width : 65 * fontSizeScale,dataIndex : 'barcode',sortable:false},
+		     {header : "审核人",width : 50 * fontSizeScale,dataIndex : 'operator',sortable:false},
+		     {header : "审核时间",width : 130 * fontSizeScale,dataIndex : 'operationTime',sortable:false},
+		     {header : "灭菌程序",width : 100 * fontSizeScale,dataIndex : 'sterilingType',sortable:false},
+		     {header : "有效期至",width : 80 * fontSizeScale,dataIndex : 'validUntil', renderer : myDateFormat,sortable:false},
+		     {header : "状态",width : 50 * fontSizeScale,dataIndex : 'status',sortable:false},
+		     {header : "包装类型",width : 60 * fontSizeScale,dataIndex : 'packageType',sortable:false}
         ]);
 		//发货信息
 		var invoicePlanSm = new Ext.grid.CheckboxSelectionModel();
 	    var invoicePlanColumns = new Ext.grid.ColumnModel([
 			invoicePlanSm,
 			{header : "invoicePlanId",dataIndex : 'invoicePlanId',hidden : true},
-			{header : "器械包名称",width : 180,dataIndex : 'tousseName'}, 
-			{header : "数量",width : 50,dataIndex : 'applicationAmount'},
-			{header : "申请科室",width : 145,dataIndex : 'depart'},
-			{header : "申请时间",width : 130,dataIndex : 'applicationTime',sortable:true},
-			{header : "申请单编号",width : 80,dataIndex : 'serialNumberOfInovicePlan'},
-			{header : "申请单类型",width : 120,dataIndex : 'invoicePlanType'},
-			{header : "发货状态",width : 80,dataIndex : 'deliverStatus'}
+			{header : "物品名称",width : 150 * fontSizeScale,dataIndex : 'tousseName'}, 
+			{header : "数量",width : 50 * fontSizeScale,align : "center",dataIndex : 'applicationAmount'},
+			{header : "申请科室",width : 140 * fontSizeScale,dataIndex : 'depart'},
+			{header : "申请时间",width : 130 * fontSizeScale,dataIndex : 'applicationTime',sortable:true},
+			{header : "申请单编号",width : 80 * fontSizeScale,dataIndex : 'serialNumberOfInovicePlan'},
+			{header : "申请单类型",width : 120 * fontSizeScale,dataIndex : 'invoicePlanType'},
+			{header : "发货状态",width : 70 * fontSizeScale,dataIndex : 'deliverStatus'}
 	    ]);
 	    
 	    applicationStore = new Ext.data.Store({
@@ -799,7 +801,7 @@
 	    invoicePlanStore.on("load",function(thiz,records,options){
 	    	var o = Ext.decode(invoicePlanStore.reader.responseText); 
 	    	var totalInvoiceAmount = o.totalInvoiceAmount;
-	    	var newTitle = "待发货器械包列表"+"(待发货器械包总数量：" + totalInvoiceAmount + ")";
+	    	var newTitle = "待发货物品列表"+"(待发货物品的总数量：" + totalInvoiceAmount + ")";
 	    	Ext.getCmp('invoicePlanGrid').setTitle(newTitle);
 		});
 
@@ -1038,7 +1040,7 @@
 		});
 		//var value = filters.getMenuFilter().getValue();
 		var invoicePlanGrid = new Ext.grid.GridPanel({
-			title:'待发货器械包',
+			title:'待发货物品',
 			height:350,
 			frame : false,
 			autoScroll:true,