Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordTotalView.js
===================================================================
diff -u -r17612 -r17626
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordTotalView.js	(.../useRecordTotalView.js)	(revision 17612)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordTotalView.js	(.../useRecordTotalView.js)	(revision 17626)
@@ -174,16 +174,18 @@
 								userJsonStore.removeAll();
 								userJsonStore.baseParams.departmentCode = record.data.id;
 								userJsonStore.baseParams.start = 0;
+								userJsonStore.baseParams.spell = '';
 								userJsonStore.reload();
 								delete userJsonStore.baseParams.start;  //加载之后需要删除这个属性以免影响后面请求参数
+								delete userJsonStore.baseParams.spell;
 								Ext.getCmp('operatorSearch').setValue('');
 								Ext.getCmp('operatorSearch').focus();
 							}
 						}
 					}]
 				},{
 					layout:'form',
-					width:150,
+					width:200,
 					labelWidth:50,
 					items:[{
 						xtype : 'combo',
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordOperatorTotalView.js
===================================================================
diff -u -r17582 -r17626
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordOperatorTotalView.js	(.../useRecordOperatorTotalView.js)	(revision 17582)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordOperatorTotalView.js	(.../useRecordOperatorTotalView.js)	(revision 17626)
@@ -2,16 +2,12 @@
 var grid;
 
 var myMask;
-function reloadReport(isFirstRoomPeople,orgName,operatorSearch){
-	var departSearch = "";
+function reloadReport(){
 	var startTime= $Id('startTime').value;
 	var endTime = $Id('endTime').value;
-	//不是一级供应室
-	if(!isFirstRoomPeople){
-		departSearch = orgName;/*Ext.getCmp('departSearch').getValue();*/////
-	}else{
-		departSearch = $Id('departSearch').value;
-	}
+	var departSearch = $Id('departSearch').value;
+	var operatorSearch = $Id('operatorSearch').value;
+	
 	myMask = new Ext.LoadMask(Ext.getBody(), {
 		msg: '正在加载，请稍候！',
 		removeMask: true
@@ -46,20 +42,24 @@
 							}, {
 								name : 'name'
 							} ]);
-	var userJsonStore = new Ext.data.Store({
-		proxy : new Ext.data.HttpProxy({
-			url : WWWROOT + '/systemmanage/user/loadUserByOrgId!loadUserByOrgId.do',
-			method : 'POST'
-		}),
-		reader : new Ext.data.JsonReader({
-			root : 'data'
-		},readerDetail)
+	 var userJsonStore = new Ext.data.Store({
+			autoLoad : false,
+			proxy : new Ext.data.HttpProxy({
+				url : WWWROOT + '/systemmanage/user/loadUserByDepartmentCode!loadUserByDepartmentCode.do',
+				method : 'POST'
+			}),
+			reader : new Ext.data.JsonReader({
+				root : 'data',
+				totalProperty : 'totalCount'
+			},readerDetail),
+			listeners : {
+				beforeload : function(_this, options) {
+					if (!isFirstRoomPeople) {
+						_this.baseParams.departmentCode = currentOrgCode;
+					}
+				}
+			}
 	});
-	//不是第一供应室的人
-	if(!isFirstRoomPeople){
-		userJsonStore.baseParams.departId = currentOrgCode;
-		userJsonStore.reload();
-	}
 	
 	var dt = new Date();
 	var startDayofMonth = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/01";
@@ -82,7 +82,7 @@
 				labelWidth : 60,
 				items : [{
 					layout:'form',
-					columnWidth:.2,
+					width:230,
 					items:[{
 						xtype : 'datefieldWithMin',
 						fieldLabel : '开始日期',
@@ -112,7 +112,7 @@
 					}]
 				},{
 					layout:'form',
-					columnWidth:.2,
+					width:230,
 					items:[{
 						xtype : 'datefieldWithMin',
 						fieldLabel : '结束日期',
@@ -139,7 +139,7 @@
 					}]
 				},{
 					layout:'form',
-					columnWidth:.22,
+					width:260,
 					labelWidth:40,
 					items:[{
 						xtype : 'combo',
@@ -156,24 +156,28 @@
 						anchor : '95%',
 						listWidth:200,
 						disabled :!isFirstRoomPeople,
+						value : !isFirstRoomPeople ? orgName : '',
 						triggerAction : 'all',
 						hideTrigger : true,
 						typeAhead : false,
 						allowBlank : true,
 						listeners:{
-							specialkey:function(field,event){
-								if(event.getKey()==Ext.EventObject.ENTER){
-									userJsonStore.removeAll();
-									userJsonStore.baseParams.departId = field.getValue();
-									userJsonStore.reload();
-									Ext.getCmp('operatorSearch').focus();
-								}
+							select : function(thisCombo, record, index) { 
+								userJsonStore.removeAll();
+								userJsonStore.baseParams.departmentCode = record.data.id;
+								userJsonStore.baseParams.start = 0;
+								userJsonStore.baseParams.spell = '';
+								userJsonStore.reload();
+								delete userJsonStore.baseParams.start;  //加载之后需要删除这个属性以免影响后面请求参数
+								delete userJsonStore.baseParams.spell;
+								Ext.getCmp('operatorSearch').setValue('');
+								Ext.getCmp('operatorSearch').focus();
 							}
 						}
 					}]
 				},{
 					layout:'form',
-					columnWidth:.18,
+					width:200,
 					labelWidth:60,
 					items:[{
 						xtype : 'combo',
@@ -188,15 +192,16 @@
 						forceSelection : true,
 						lazyInit : true,
 						anchor : '95%',
-						listWidth:150,
+						pageSize : 50,
+						listWidth:300,
 						triggerAction : 'all',
 						hideTrigger : true,
 						typeAhead : false,
 						allowBlank : true,
 						listeners:{
 							specialkey:function(field,event){
 								if(event.getKey()==Ext.EventObject.ENTER){
-									reloadReport(isFirstRoomPeople,orgName,field.getRawValue());
+									reloadReport();
 								}
 							}
 						}
@@ -209,7 +214,7 @@
 				minWidth : 70,
 				iconCls : 'icon_search',
 				handler : function() {
-					reloadReport(isFirstRoomPeople,orgName,Ext.getCmp('operatorSearch').getRawValue());
+					reloadReport();
 				}
 			},{
 				xtype : 'button',
@@ -243,5 +248,5 @@
 				items : reportForm
 			}]
 		});
-		reloadReport(isFirstRoomPeople,orgName,userName);
+		reloadReport();
 	});
\ No newline at end of file