Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r33910 -r33919
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 33910)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 33919)
@@ -238,7 +238,7 @@
 	if (objectId !== '') {
 		var params = {
 			objectId: objectId,
-			videoType:encodeURIComponent('配包教学视频')
+			videoType: encodeURIComponent('配包教学视频')
 		}
 		openModalWindowForExt(WWWROOT + "/disinfectsystem/basedatamanager/tousse/watchVideoModel.jsp", params, "配包教学视频", "800", "390");
 	} else {
@@ -2854,6 +2854,47 @@
 			});
 			deletePackingTask(ids, null, null, true, null);
 		}
+	}, "-", {
+		xtype: 'triggerfield',
+		id: 'tousseOrDepart',
+		emptyText: '搜索物品或科室',
+		triggerCls: 'x-form-clear-trigger',
+		trigger2Cls: 'x-form-search-trigger',
+		listeners: {
+			render: function (c) {
+				var clickCount = 0;
+				c.getEl().on('keypress', function (e) {
+					if (clickCount == 0) {
+						setTimeout(function () {
+							Ext4.getCmp('pageNow').setValue(1);
+							waitPackingTaskStore.load();
+							clickCount = 0;
+						}, 1000);
+						clickCount++;
+					}
+				});
+				c.getEl().on('keydown', function (e) {
+					//删除键
+					if (e.getKey() == 8 && clickCount == 0) {
+						setTimeout(function () {
+							Ext4.getCmp('pageNow').setValue(1);
+							waitPackingTaskStore.load();
+							clickCount = 0;
+						}, 1000);
+						clickCount++;
+					}
+				});
+			}
+		},
+		onTriggerClick: function () {
+			Ext4.getCmp('tousseOrDepart').setValue('');
+			Ext4.getCmp('pageNow').setValue(1);
+			waitPackingTaskStore.load();
+		},
+		onTrigger2Click: function () {
+			Ext4.getCmp('pageNow').setValue(1);
+			waitPackingTaskStore.load();
+		}
 	}];
 
 	var basketStore = new Ext4.data.TreeStore({
@@ -2888,6 +2929,7 @@
 					taskGroup: taskGroup,
 					node: 'root',
 					pageIndex: pageNow,
+					tousseOrDepart: Ext4.getCmp('tousseOrDepart').getValue(),
 					pageSize: waitPackingPageSize
 				};
 				Ext4.apply(store.proxy.extraParams, params);
@@ -2916,9 +2958,10 @@
 				});
 				var pageNow = Ext4.getCmp('pageNow').getValue();
 				var waitPackingPageSize = Ext4.getCmp('waitPackingPageSize').getValue();
+				var tousseOrDepart = Ext4.getCmp('tousseOrDepart').getValue();
 				Ext4.Ajax.request({
 					url: WWWROOT + '/disinfectSystem/packingAction!loadWaitPackingTaskPageJson.do',
-					params: { taskGroup: taskGroup, pageSize: waitPackingPageSize },
+					params: { taskGroup: taskGroup, pageSize: waitPackingPageSize, tousseOrDepart: tousseOrDepart },
 					success: function (response, options) {
 						var result = Ext4.decode(response.responseText);
 						if (result.success) {