Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
===================================================================
diff -u -r41118 -r41139
--- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 41118)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 41139)
@@ -2871,6 +2871,14 @@
 	reviewedChartPanelStore.on("beforeload", function(thiz, options) {
 		var taskGroup = $Id("parm_s_taskGroup").value;
 		thiz.baseParams["taskGroup"] = taskGroup;
+		var reviewDate = Ext.getCmp('reviewDateFilter').getValue();
+		var tousseName = Ext.getCmp('tousseNameFilter').getValue();
+		if(reviewDate && Object.prototype.toString.call(reviewDate) === '[object Date]'){
+			// 如果是日期，将日期转为时间，格式yyyy-MM-dd
+			reviewDate = Ext.util.Format.date(reviewDate, 'Y-m-d');
+		}
+		thiz.baseParams["date"] = reviewDate;
+		reviewedChartPanelStore.baseParams["tousseName"] = tousseName;
 	});
 	
 	reviewedChartPanelStore.on('datachanged',function(store){
@@ -2882,6 +2890,24 @@
 		}
 		Ext.getCmp('reviewedsum').setValue(sum);
 	});
+
+	//器械包名称store
+	var tousseStore = new Ext.data.Store({
+		proxy : new Ext.data.HttpProxy({
+			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getAllTousseDefinitionData.do',
+			method : 'POST'
+		}),
+		reader : new Ext.data.JsonReader({
+				totalProperty : 'totalCount',
+				root : 'data'
+			}, [
+				{name : 'id',mapping : 'id'},
+				{name : 'spelling',mapping : 'spelling'},
+				{name : 'name',mapping : 'name'},
+				{name : 'displayName',mapping : 'displayName'},
+				{name : 'amount',mapping : 'amount'}]
+		)
+	});
 	
 	/** 今天审核任务统计 **/
 	var reviewedChartPanel = new Ext.grid.GridPanel({
@@ -2896,7 +2922,7 @@
 	    ]),
         stripeRows: true,
         autoExpandColumn: 'amount',
-        title:'今天本组已'+reviewViewText+'的器械包',
+        title:'本组已'+reviewViewText+'的器械包1',
         tbar : [{
 			text : '已'+reviewViewText+'器械包总数:'
 		},{
@@ -2936,7 +2962,80 @@
 					reviewedChartPanelStore.reload();
 				}
 			}
-		 }]
+		 }, {
+			xtype: 'tbtext',
+			text: '审核日期：'
+		 }, {
+			 xtype : 'datefield',
+			 name : 'reviewDateFilter',
+			 id : 'reviewDateFilter',
+			 readOnly : true,
+			 altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+			 emptyText : '默认为今天',
+			 editable : false,
+			 format : 'Y-m-d',
+			 allowBlank : true,
+			 anchor : '95%'
+		 }, {
+			xtype: 'tbtext',
+			text: '器械包名称：'
+		}, {
+			xtype : 'combo',
+			id : 'tousseNameFilter',
+			name : 'tousseNameFilter',
+			queryParam : 'spell',
+			minChars : 0,
+			valueField : 'name',
+			displayField : 'displayName',
+			store : tousseStore,
+			pageSize : 100,
+			listWidth:300,
+			forceSelection : false,
+			lazyInit : true,
+			triggerAction : 'all',
+			hideTrigger : true,
+			typeAhead : false,
+			anchor : '100%',
+			listeners : {
+				select : function(combo, record, index) {
+					combo.setValue(record.data.name);
+					reviewedChartPanelStore.reload();
+				}
+			}
+		},{
+			xtype: 'tbbutton',
+			text: '查询',
+			style : 'margin-left:90px;',   //为什么要加这90个margin-left,因为不加就被器械包名输入框覆盖了
+			iconCls: 'icon_search',
+			handler: function(){
+				reviewedChartPanelStore.reload();
+			}
+		}, {
+			xtype: 'tbbutton',
+			text: '重置',
+			iconCls: 'btn_ext_refresh1',
+			handler: function(){
+				console.log(Ext.getCmp('tousseNameFilter'), Ext.getCmp('reviewDateFilter'));
+				Ext.getCmp('tousseNameFilter').clearValue();
+				Ext.getCmp('reviewDateFilter').reset();
+				if(sstsConfig.reviewModuleVersion === 2) {
+					var combo = Ext.getCmp('taskGroup_review1');
+					var store = combo.store;
+
+					if (store.getCount() > 0) {
+						var firstRecord = store.getAt(0); // 获取第一条记录
+						combo.setValue(firstRecord.get(combo.valueField));
+
+						// 手动触发select事件
+						combo.fireEvent('select', combo, [firstRecord]);
+					} else {
+						reviewedChartPanelStore.reload();
+					}
+				}else{
+					reviewedChartPanelStore.reload();
+				}
+			}
+		}]
 	});
 	
 	var tabs = new Ext.TabPanel({