Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r20877 -r21332
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 20877)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 21332)
@@ -191,6 +191,11 @@
 	           {name: 'depart'},
 	           {name: 'packer'},
 	           {name: 'tousseName'},
+	           {name: 'reviewer'},
+	           {name: 'supplierName'},
+	           {name: 'doctor'},
+	           {name: 'foreignMaterialsAmount'},
+	           {name: 'splitTousseName'},
 	           {name: 'amount'}
 	    ]
 	});
@@ -214,10 +219,12 @@
     function initQueryValueAndReload() {
 		var tousseName = Ext4.getCmp('tousseName').getValue();
 		var orgUnit = Ext4.getCmp('orgUnit').getValue();
+		var barcode = Ext4.getCmp('scanTousseBarcode').getValue();
 		packingRecordStore .load({
 			params: {
 				tousseName: tousseName,
-				orgUnit: orgUnit
+				orgUnit: orgUnit,
+				tousseBarcode: barcode
 			}});
 	}
 
@@ -3468,7 +3475,7 @@
 					height : 30,
 					labelWidth : 70,
 					items : [{
-						width : 470,
+						width : 250,
 						layout : 'form',
 						labelWidth : 80,
 						items : [{
@@ -3513,7 +3520,7 @@
 							}
 						}]
 					},{
-						width : 400,
+						width : 250,
 						layout : 'form',
 						items : [{
 							xtype : 'combo',
@@ -3534,6 +3541,34 @@
 							typeAhead : false,
 							anchor : '95%'
 						}]
+					},{
+						width : 250,
+						layout : 'form',
+						labelWidth : 100,
+						items : [{
+							xtype : 'textfield',
+							fieldLabel : '器械包条码',
+							allowBlank : true,
+							name : "scanTousseBarcode",
+							id : "scanTousseBarcode",
+							width : 150,
+//							anchor : '100%',
+							listeners : {
+								render : function(p) {
+									p.getEl().on('keypress',function(e) {
+										if (e.getKey() == 13) {//回车键
+											var barcode = Ext4.getCmp('scanTousseBarcode').getValue();
+											if(!isUndefinedOrNullOrEmpty(barcode)){
+												initQueryValueAndReload();
+											}
+										}
+									});
+									p.getEl().on('focus',function(e) {
+										Ext4.getCmp('scanTousseBarcode').setValue("");
+									});
+								}
+							}
+						}]
 					}, {
 						width : 80,
 						layout : 'form',
@@ -3557,30 +3592,39 @@
 							handler : function() {
 								Ext4.getCmp('tousseName').setValue("");
 								Ext4.getCmp('orgUnit').setValue("");
+								Ext4.getCmp('scanTousseBarcode').setValue("");
 //								$Id('tousseName').value = "";
 							}
 						}]
 					}]
 				
     			},{
-
-
     				region : 'center',
     				margin : '0 0 0 0',
 		            layout:'fit',
+    				
 		            items: [
 							Ext4.create('Ext4.grid.Panel', {
 							    store : packingRecordStore,
 							    columnLines: true,
+							    width: 800,
+//							    autoScroll: true,
+							    overflowX: 'auto',
+//							    overflowX: 'scroll',
 							    id : 'todayHisPackingRecordPanel',
 //							    height: document.body.clientHeight-25,
 							    viewConfig : {loadMask : {msg : '正在加载，请稍候...'}},
 							    columns: [
 							        {header: '科室', dataIndex: 'depart',width: 200}, 
-								    {header: '装配时间', dataIndex: 'packTimeStr',width: 150}, 
-								    {header: '器械包', dataIndex: 'tousseName', width: 200,renderer:filterUnderScoreName}, 
-								    {header: '数量', dataIndex: 'amount'}, 
-								    {header: '配包人',flex: 1, dataIndex: 'packer'}
+							        {header: '供应商', dataIndex: 'supplierName',width: 150},
+							        {header: '器械包', dataIndex: 'tousseName', width: 200,renderer:filterUnderScoreName},
+							        {header: '拆包名称', dataIndex: 'splitTousseName',width: 200},
+								    {header: '数量', dataIndex: 'amount'},
+								    {header: '配包人', dataIndex: 'packer'},
+								    {header: '审核人', dataIndex: 'reviewer',width: 100},
+								    {header: '装配时间', dataIndex: 'packTimeStr',width: 150},
+								    {header: '材料汇总', dataIndex: 'foreignMaterialsAmount',width: 200},
+								    {header: '医生', dataIndex: 'doctor',width: 100}
 							    ],
 							    autoExpandColumn : 'packer',
 							    dockedItems: [