Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js
===================================================================
diff -u -r32434 -r32443
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js	(.../proxyDisinfectionView.js)	(revision 32434)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js	(.../proxyDisinfectionView.js)	(revision 32443)
@@ -630,7 +630,7 @@
 		{ name: 'deliverStatus' }
 	];
 
-	var optionsArray = ['待接收', '部分接收', '待发货', '已发货', '已终止']
+	var optionsArray = ['待接收', '部分接收', '部分发货', '待发货', '已发货', '已终止']
 
 	var filters = new Ext.grid.GridFilters({
 		filters: [
Index: ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js
===================================================================
diff -u -r32339 -r32443
--- ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js	(.../historyPackingView.js)	(revision 32339)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js	(.../historyPackingView.js)	(revision 32443)
@@ -145,7 +145,7 @@
   	     {header: '审核人', dataIndex: 'reviewer',width: 100},
   	     {header : "装配时间",width : 150,dataIndex : 'packTime',renderer:myDateFormatBySecond}, 
 		{header: '灭菌方式', dataIndex: 'sterilingMode',width: 120,hidden:!(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && !isFirstRoomPeople)},
-		{header: '已生成代理灭菌单', dataIndex: 'isTran',width: 120,hidden:!(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && isFirstRoomPeople)},
+		{header: '已生成代理灭菌单', dataIndex: 'isTran',width: 120,hidden:!(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && !isFirstRoomPeople)},
 		{header: '材料汇总', dataIndex: 'foreignMaterialsAmount',width: 200},
   	     {header: '医生', dataIndex: 'doctor',width: 100}
   	];
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r32431 -r32443
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32431)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32443)
@@ -1,6 +1,7 @@
 Ext4.require('Ext4.tab.*');
 Ext4.require(['Ext4.data.*', 'Ext4.grid.*']);
 var basketColumnTreeGrid;
+var listGrid;
 var splitForeignTousseFlag = false;//拆包
 //记住最后选择的器械包图片名称、类型、视频名称、包定义id;用于查看材料图片后再次查询器械包
 var lastSelectTousseName;
@@ -449,7 +450,7 @@
 			{header: '包装类型', dataIndex: 'packageType'},
 			{header: '装配时间', dataIndex: 'packTimeStr',width: 150},
 			{header: '灭菌方式', dataIndex: 'sterilingMode',width: 120,hidden:!(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && !isFirstRoomPeople)},
-			{header: '已生成代理灭菌单', dataIndex: 'isTran',width: 120,hidden:!(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && !isFirstRoomPeople)},
+			{header: '已生成代理灭菌单', dataIndex: 'isTran',width: 120,hidden:!(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && isFirstRoomPeople)},
 			{header: '材料汇总', dataIndex: 'foreignMaterialsAmount',width: 200},
 			{header: '医生', dataIndex: 'doctor',width: 100}
 			]
@@ -5449,6 +5450,161 @@
 	store: waitPackingTaskStore,
 	tbar : waitPackingTbar
 });
+
+function search() {
+	var searchColumns = '';
+	Ext4.getCmp('searchMenu').items.each(function (item) {
+		if (item.checked) {
+			searchColumns += item.name + ';';
+		}
+	});
+	searchColumns = searchColumns.substring(0, searchColumns.length - 1);
+	listStore.proxy.extraParams.query = Ext4.getCmp('searchKeyWord').getValue();
+	listStore.proxy.extraParams.fields = searchColumns;
+	listStore.loadPage(1);
+	listStore.reload();
+	Ext4.getCmp('searchKeyWord').setValue('');
+}
+var tbar = ['->', {
+	width: 70,
+	text: '搜索列',
+	id: 'searchButton',
+	menu: {
+		id: 'searchMenu',
+		items: [{
+			xtype: 'menucheckitem',
+			name: 'depart',
+			checked: true,
+			text: '科室'
+		}, {
+			xtype: 'menucheckitem',
+			name: 'supplierName',
+			checked: true,
+			text: '供应商'
+		},{
+			xtype: 'menucheckitem',
+			name: 'tousseName',
+			checked: true,
+			text: '器械包'
+		}, {
+			xtype: 'menucheckitem',
+			name: 'splitTousseName',
+			checked: true,
+			text: '拆包名称'
+		},{
+			xtype: 'menucheckitem',
+			name: 'amount',
+			checked: true,
+			text: '数量'
+		}, {
+			xtype: 'menucheckitem',
+			name: 'packer',
+			checked: true,
+			text: '配包人'
+		},{
+			xtype: 'menucheckitem',
+			name: 'reviewer',
+			checked: true,
+			text: reviewViewText+'人'
+		}, {
+			xtype: 'menucheckitem',
+			name: 'packageType',
+			checked: true,
+			text: '包装类型'
+		},{
+			xtype: 'menucheckitem',
+			name: 'packTimeStr',
+			checked: true,
+			text: '装配时间'
+		}, {
+			xtype: 'menucheckitem',
+			name: 'sterilingMode',
+			checked: true,
+			text: '灭菌方式'
+		},{
+			xtype: 'menucheckitem',
+			name: 'isTran',
+			checked: true,
+			text: '已生成代理灭菌单'
+		}, {
+			xtype: 'menucheckitem',
+			name: 'foreignMaterialsAmount',
+			checked: true,
+			text: '材料汇总'
+		},{
+			xtype: 'menucheckitem',
+			name: 'doctor',
+			checked: true,
+			text: '医生'
+		}]
+	},
+	listeners: {
+		focus: function (thisButton, The, eOpts) {
+			Ext4.getCmp('searchKeyWord').focus();
+		}
+	}
+}, {
+	xtype: 'textfield',
+	name: 'searchKeyWord',
+	id: 'searchKeyWord',
+	enableKeyEvents: true,
+	listeners: {
+		keydown: function (thisTextfield, e, eOpts) {
+			if (e.keyCode == 13) {
+				search(listStore);
+			}
+		}
+	}
+}, {
+	text: '搜索',
+	handler: function (thisButton) {
+		search(listStore);
+	}
+}];
+
+listStore = new Ext4.data.JsonStore({
+	proxy: {
+		type: 'ajax',
+		url: WWWROOT + '/disinfectSystem/packingAction!loadPackingRecord.do',
+		reader: {
+			root: 'rows'
+		},
+		extraParams: {}
+	},
+	fields: readerDetail,
+	listeners:{
+		beforeload: function(thiz, options) {
+			if(!isQueryParamsValid()){
+				return false;
+			}
+			var p = getParamsJsonObj();
+			Ext4.apply(listStore.proxy.extraParams,p);
+		}
+	}
+});
+
+listStore.loadPage(1);
+
+listGrid = new Ext4.grid.GridPanel({
+	title: '',
+	columns: columns,
+	id:'todayHisPackingRecordPanel',
+	frame: false,
+	autoScroll: false,
+	store: listStore,
+	tbar: tbar,
+	dockedItems: [{
+		xtype: 'pagingtoolbar',
+		store: listStore,   // same store GridPanel is using  
+		dock: 'bottom',
+		displayInfo: true
+	}],
+	viewConfig: {
+		autoFill: true
+	},
+	selModel: new Ext4.selection.CheckboxModel()
+});
+
 var mainTabCls = /*(Ext4.isIE8 || Ext4.isIE6) ? 'mainTabCls' :*/ '';
 var tabs2 = Ext4.widget('tabpanel', {
     activeTab: 0,
@@ -5496,7 +5652,7 @@
 					hidden:!(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && !isFirstRoomPeople),
     		    	id:"createProxyDisinfection",
     		    	handler: function(){
-    		    		var selectedRecords = Ext4.getCmp("todayHisPackingRecordPanel").getSelectionModel().getSelection();
+    		    		var selectedRecords = listGrid.getSelectionModel().getSelection();
 						addAndEditProxyDisinfection(0,selectedRecords);
     		    	}
     		    },{
@@ -5730,7 +5886,7 @@
 							minWidth : 70,
 							iconCls : 'icon_search',
 							handler : function() {
-								initQueryValueAndReload();
+								search();
 							}
 						}]
 					}, {
@@ -5759,53 +5915,7 @@
     				margin : '0 0 0 0',
 		            layout:'fit',
     				
-		            items: [
-
-
-// forgon4 grid
-						Ext4.create('ExtJs.forgon4.Grid', {
-										title : '',
-										id : 'todayHisPackingRecordPanel',
-										width: 800,
-										overflowX: 'auto',
-										dataUrl : WWWROOT + '/disinfectSystem/packingAction!loadPackingRecord.do',
-										fields : readerDetail,
-										columns : columns,
-//										showRowNumber: true,
-										sorters : { property : 'id', direction: 'DESC'},
-										extraParams : {},  //如果你要自定义参数，这里一定要先给一个空的对象，要不然会报空异常
-										showRightClick : false,
-										storeListeners: {
-											beforeload: function(thiz, options) {
-												if(!isQueryParamsValid()){
-													return false;
-												}
-												var grid = Ext4.getCmp("todayHisPackingRecordPanel");
-												var p = getParamsJsonObj();
-												
-//												alert(thiz.baseParams.taskGroup)
-												Ext4.apply(grid.extraParams,p);
-											}
-									    },
-										listeners: {
-									        itemclick: function (dv, record, item, index, e) {
-												if(e.target.className == 'x4-grid-row-checker'){
-													return;
-												}
-									        	var packingRecordId = record.get('id');
-									        	var cfg = {
-									        			packingRecordId:packingRecordId,
-									        			SSTS_HistoryPacking_Update:SSTS_HistoryPacking_Update,
-									        			SSTS_HistoryPacking_Change_Patient:SSTS_HistoryPacking_Change_Patient,
-									        			onClose: function(){
-									        				packingRecordStore.reload();
-									        			}
-									        	}
-									        	rePrintBarcodeWinForPacking2(cfg);
-									        }
-									    }
-									})
-		            ]
+		            items: listGrid
 	            
     			}]
     		}
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js
===================================================================
diff -u -r32433 -r32443
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js	(.../proxyDisinfectionForm.js)	(revision 32433)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js	(.../proxyDisinfectionForm.js)	(revision 32443)
@@ -554,9 +554,9 @@
 					} else {
 						if (result.message) {
 							showResult(result.message);
-							clearGoodsGrid();
-							loadProxyDisinfection(form, id, isFirstRoomPeople);
 						}
+						clearGoodsGrid();
+						loadProxyDisinfection(form, id, isFirstRoomPeople);
 					}
 				} else {
 					if (result.message) {