Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.js
===================================================================
diff -u -r34966 -r35642
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.js	(.../urgentNeedGoodsProcessingCycleView.js)	(revision 34966)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.js	(.../urgentNeedGoodsProcessingCycleView.js)	(revision 35642)
@@ -27,7 +27,10 @@
 	var endTime = $Id('endTime').value;
 	var tousseId = Ext.getCmp('tousse').getValue();
 	var tousseName = Ext.getCmp('tousse').getRawValue();
-	
+	var departs = Ext.getCmp('departs').getValue();
+	if(departs.indexOf('全部') >= 0){
+		departs = null;
+	}
 	myMask = new Ext.LoadMask(Ext.getBody(), {
 		msg: '正在加载，请稍候！',
 		removeMask: true
@@ -41,9 +44,9 @@
 		tousseName : tousseName,
 		departCoding : departCoding,
 		tousseTypes : tousseTypes,
+		departs:departs,
 		reportName:'urgentNeedGoodsProcessingCycle'
 	}
-
 	searchReport(url,params);
 }
 
@@ -127,6 +130,31 @@
 		    {name : 'name',mapping : 'name'}]
 		)
 	});
+
+	//申请科室
+	var departStore = new Ext.data.Store({
+		proxy: new Ext.data.HttpProxy({
+			url: WWWROOT + '/systemmanage/orgUnit/searchApplyDepartmentByKeyWord.do?onlyOneself=false&showDisableOrgUnit=false',
+			method: 'POST'
+		}),
+		reader: new Ext.data.JsonReader({
+			root: 'data'
+		}, [
+			{ name: 'id', mapping: 'departmentCode' },
+			{ name: 'name', mapping: 'departmentName' }
+		]),
+		listeners: {
+			load: function (thiz, records, options) {
+				if (records.length > 0) {
+					var items = Ext.data.Record.create([
+						{ name: 'id', type: 'string' },
+						{ name: 'name', type: 'string' }
+					]);
+					departStore.insert(0, new items({ 'id': 'null', 'name': '全部' }));
+				}
+			}
+		}
+	});
 	
 	form = new Ext.form.FormPanel({
 		title : entityName,
@@ -139,13 +167,13 @@
 		border : 0,
 		frame : true,
 		bodyStyle : 'padding:0px auto;margin:0px',// padding:1px;padding-top:5px;
-		height : 120,
+		height : 140,
 		items : [{
 			layout : 'column',
-			height : 40,
+			height : 60,
 			labelWidth : 70,
 			items : [{
-				width : 220,
+				columnWidth: .25,
 				layout : 'form',
 				items : [{
 					xtype : 'datefield',
@@ -158,7 +186,7 @@
 	    			value : new Date(startDayofMonth)
 				}]
 			},{
-				width : 220,
+				columnWidth: .25,
 				layout : 'form',
 				items : [{
 					xtype : 'datefield',
@@ -171,7 +199,7 @@
 	    			value : dt
 				}]
 			},{
-				width : 280,
+				columnWidth: .25,
 				layout : 'form',
 				labelWidth : 100,
 				labelSeparator : '选择器械包:',
@@ -189,7 +217,7 @@
 					anchor : '95%'
 				}]
 			},{
-				width : 250,
+				columnWidth: .25,
 				layout : 'form',
 				labelWidth : 100,
 				labelSeparator : '选择供应室:',
@@ -240,7 +268,7 @@
 					}
 				}]
 			},{
-				width : 400,
+				columnWidth: .25,
 				layout : 'form',
 				labelWidth : 100,
 				labelSeparator : '器械包类型:',
@@ -293,6 +321,55 @@
 						}
 					}
 				}]
+			},{
+				columnWidth: .25,
+				layout : 'form',
+				labelWidth : 100,
+				labelSeparator : '申请科室:',
+				items : [{
+					xtype: 'multiSelect',
+					id: 'departs',
+					name: 'departs',
+					valueField: 'name',
+					displayField: 'name',
+					minChars: 0,
+					queryParam: 'spell',
+					allowBlank: true,
+					store: departStore,
+					mode: 'remote',
+					multiSelectIsClear: false,
+					triggerAction: 'all',
+					anchor: '95%',
+					listeners: {
+						select: function (combo, record, index) {
+							//1、如果选中“全部”的项，则把所有的项选中，反之全部取消选择
+							if (record.get('name') == '全部') {
+								if (record.get('checked')) {
+									combo.selectAll();
+								} else {
+									combo.deselectAll();
+								}
+							}
+
+							//2、如果已经选中所有的项，则把“全部”项选中，反之把“全部”项取消选择
+							var selectAll = true;
+							combo.store.each(function (record) {
+								if (record.get('name') != ALL && !record.get(this.checkField)) {
+									selectAll = false;
+									return;
+								}
+							}, combo);
+
+							var all = combo.store.getAt(0);
+							if (selectAll) {
+								all.set(combo.checkField, true);
+							} else {
+								all.set(combo.checkField, false);
+							}
+							combo.setValue(combo.getCheckedValue());
+						}
+					}
+				}]
 			}]
 		}],
 		buttons:[{