Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.js
===================================================================
diff -u -r35298 -r37440
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.js	(.../tousseGoodsStockView.js)	(revision 35298)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.js	(.../tousseGoodsStockView.js)	(revision 37440)
@@ -123,9 +123,18 @@
 		{ header: "id", dataIndex: 'id', menuDisabled: true, hidden: true },
 		{ header: "签收时间", width: 100, dataIndex: 'signedDate', menuDisabled: true },
 		{ header: "签收人", width: 60, dataIndex: 'signedUser', menuDisabled: true },
-		{ header: "失效期", width: 90, dataIndex: 'validUntil', menuDisabled: true },
+		{ header: "失效期", width: 120, dataIndex: 'validUntil', menuDisabled: true },
 		{ header: "包条码 ", width: 100, dataIndex: 'barcode', menuDisabled: true },
-		{ header: "发货时间", width: 90, dataIndex: 'invoiceSendTime', menuDisabled: true },
+		{ header: "灭菌日期", width: 120, dataIndex: 'sterileEndTime', menuDisabled: true },
+		{ header: "灭菌批号", width: 100, menuDisabled: true,renderer:function(v, p, record){
+			var name = record.data['sterilizerName'];
+			var sterileFrequency = record.data['sterileFrequency'];
+			if(name != '' && (sterileFrequency != '' && sterileFrequency != null)){
+				return name + "，第" + sterileFrequency + "炉";
+			}
+			return "";
+		} },
+		{ header: "发货时间", width: 120, dataIndex: 'invoiceSendTime', menuDisabled: true },
 		{ header: "发货人 ", width: 100, dataIndex: 'invoiceSender', menuDisabled: true }
 	];
 
@@ -136,6 +145,9 @@
 		{ name: 'validUntil' },
 		{ name: 'barcode' },
 		{ name: 'invoiceSender' },
+		{ name: 'sterileEndTime' },
+		{ name: 'sterileFrequency' },
+		{ name: 'sterilizerName' },
 		{ name: 'invoiceSendTime' }
 	];
 
@@ -216,7 +228,7 @@
 	var numberDetailWin = new top.Ext.Window({
 		id: 'numberDetailWin',
 		layout: 'fit',
-		width: 650,
+		width: 950,
 		title: title,
 		border: false,
 		modal: true,