Index: ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
===================================================================
diff -u -r28414 -r28421
--- ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 28414)
+++ ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 28421)
@@ -594,6 +594,7 @@
 					store: tousseGroupStore,
 					forceSelection: true,
 					allowBlank: true,
+					editable: false,
 					triggerAction: 'all',
 					anchor: '95%'
 				}]
@@ -790,10 +791,18 @@
 			minWidth: 70,
 			iconCls: 'icon_set',
 			handler: function () {
-				$Id('goodsSearch').value = "";
-				$Id('tousseType').value = "";
+				$Id('goodsSearch').value;
+				$Id('comboTousseType').value = "";
 				$Id('department').value = "";
+				$Id('tousseGroupName').value = "";
+				$Id('taskGroup').value = "";
+				$Id('querySupplyRoom').value = "";
+				Ext.getCmp('goodsSearch').setValue("");
+				Ext.getCmp('comboTousseType').setValue("");
 				Ext.getCmp('department').setValue("");
+				Ext.getCmp('tousseGroupName').setValue("");
+				Ext.getCmp('taskGroup').setValue("");
+				Ext.getCmp('querySupplyRoom').setValue("");
 				$Id('startDate' + IDS).value = "";
 				$Id('endDate' + IDS).value = "";
 			}
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperate.js
===================================================================
diff -u -r28414 -r28421
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperate.js	(.../tousseOperate.js)	(revision 28414)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperate.js	(.../tousseOperate.js)	(revision 28421)
@@ -3,52 +3,164 @@
 var myMask;
 var reportFormGrid;
 var windowObj = null;
-function checkInfo() {
-	//器械包
-	var tousseReader = new Ext.data.JsonReader( {
-		fields : [
-			{name : 'tousseName'},
-			{name : 'applicationAmount'},
-			{name : 'tousseName'},
-			{name : 'amount'}
-		]
-	});
+function tousseInfo(tousseName,countType,count) {
+	var readerJson;
+	var columnModel;
+	var titleText = '';
 
-	/**
-	 * 器械包实例远程数据源
-	 */
-	var tousseInfoStore = new Ext.data.Store({
-		proxy : new Ext.data.HttpProxy({
-			url : WWWROOT + '/JasperreportsAction!getSummaryInformationOfDepartmentOperationMonitoring.do',
+	if(countType == 'applicationDetails'){
+		readerJson = new top.Ext.data.JsonReader({
+			fields : [
+				  {name : 'applicationTime'},
+				  {name : 'amount'},
+				  {name : 'depart'},
+				  {name : 'applicant'}
+			  ]
+		});
+	
+		columnModel = new top.Ext.grid.ColumnModel([
+			{header : "申请时间",width : 180,dataIndex : 'applicationTime'},
+			{header : "申请数量",width : 60,dataIndex : 'amount'}, 
+			{header : "申请科室",width : 60,dataIndex : 'depart'}, 
+			{header : "申请人",width : 60,dataIndex : 'applicant'}
+		]);
+
+		titleText = '申请总数';
+	}else if(countType == 'recyDetails'){
+		readerJson = new top.Ext.data.JsonReader({
+			fields : [
+				  {name : 'recyclingTime'},
+				  {name : 'recyAmount'},
+				  {name : 'depart'},
+				  {name : 'orgUnitName'},
+				  {name : 'recyclingUser'},
+				  {name : 'operator'}
+			  ]
+		});
+	
+		columnModel = new top.Ext.grid.ColumnModel([
+			{header : "回收时间",width : 180,dataIndex : 'recyclingTime'},
+			{header : "回收数量",width : 60,dataIndex : 'recyAmount'}, 
+			{header : "申请科室",width : 60,dataIndex : 'depart'},
+			{header : "处理科室",width : 60,dataIndex : 'orgUnitName'},
+			{header : "回收人",width : 130,dataIndex : 'recyclingUser'},
+			{header : "清点人",width : 130,dataIndex : 'operator'}
+		]);
+
+		titleText = '回收总数';
+	}else if(countType == 'invoiceDetails'){
+		readerJson = new top.Ext.data.JsonReader({
+			fields : [
+				  {name : 'sendTime'},
+				  {name : 'invoiceAmount'},
+				  {name : 'depart'},
+				  {name : 'settleAccountsDepart'},
+				  {name : 'sender'}
+			  ]
+		});
+	
+		columnModel = new top.Ext.grid.ColumnModel([
+			{header : "发货时间",width : 180,dataIndex : 'sendTime'},
+			{header : "发货数量",width : 60,dataIndex : 'invoiceAmount'},
+			{header : "申请科室",width : 60,dataIndex : 'depart'},
+			{header : "处理科室",width : 60,dataIndex : 'settleAccountsDepart'},
+			{header : "发货人",width : 60,dataIndex : 'sender'}
+		]);
+
+		titleText = '发货总数';
+	}else if(countType == 'signDetails'){
+		readerJson = new top.Ext.data.JsonReader({
+			fields : [
+				  {name : 'signedDate'},
+				  {name : 'amount'},
+				  {name : 'depart'},
+				  {name : 'signUserName'},
+				  {name : 'orgUnitName'}
+			  ]
+		});
+	
+		columnModel = new top.Ext.grid.ColumnModel([
+			{header : "签收时间",width : 180,dataIndex : 'signedDate'},
+			{header : "签收数量",width : 60,dataIndex : 'amount'},
+			{header : "签收科室",width : 60,dataIndex : 'depart'},
+			{header : "签收人",width : 60,dataIndex : 'signUserName'},
+			{header : "处理科室",width : 60,dataIndex : 'orgUnitName'},
+		]);
+
+		titleText = '签收总数';
+	}else if(countType == 'useDetails'){
+		readerJson = new top.Ext.data.JsonReader({
+			fields : [
+				  {name : 'useTime'},
+				  {name : 'amount'},
+				  {name : 'depart'},
+				  {name : 'operator'}
+			  ]
+		});
+	
+		columnModel = new top.Ext.grid.ColumnModel([
+			{header : "使用时间",width : 180,dataIndex : 'useTime'},
+			{header : "使用数量",width : 60,dataIndex : 'amount'},
+			{header : "使用科室",width : 60,dataIndex : 'depart'},
+			{header : "录入人",width : 60,dataIndex : 'operator'}
+		]);
+
+		titleText = '使用总数';
+	}
+
+	if(count == 0){
+		showResult('【'+tousseName+'】的'+titleText+'为0，不能查看明细');
+		return;
+	}
+
+	var godownEntryItemStore = new top.Ext.data.Store({
+		proxy : new top.Ext.data.HttpProxy({
+			url: WWWROOT + '/jasperreports/jasperreportsAction!getInformationOfDepartmentOperationMonitoring.do',
 			method : 'POST'
 		}),
-		reader : tousseReader
+		reader : readerJson,
+		listeners:{
+			beforeload:function(store){
+				var startDate= $Id('startDate').value;
+				var endDate= $Id('endDate').value;
+				if(startDate ==  null || startDate == ''
+					|| endDate == null || endDate == ''){
+					showResult('查询时间有误,请正确选择查询时间。');
+					return false;
+				}
+
+				var tousseType = Ext.getCmp('comboTousseType').getValue();
+				var sterilizationMode = Ext.getCmp('sterilizationMode').getValue();
+				var taskGroupName = $Id('tousseGroupName').value;
+
+				store.baseParams.startDate = startDate;
+				store.baseParams.endDate = endDate;
+				store.baseParams.goodsName = tousseName;
+				store.baseParams.tousseType = tousseType;
+				store.baseParams.sterilizationMode = sterilizationMode;
+				store.baseParams.taskGroupName = taskGroupName;
+				store.baseParams.modeName = countType;
+			}
+		}
 	});
 
-	var tousseCm = new Ext.grid.ColumnModel([
-		{header : "器械包名称",dataIndex : 'barcode',width : 100,menuDisabled : true},
-		{header : "名称",dataIndex : 'tousseName',id : 'tousseName',width : 280,menuDisabled : true},
-		{header : "数量",dataIndex : 'amount',width : 75,menuDisabled : true},
-		{header : '删除操作',id : 'delAction',width : 50}
-	]);
+	godownEntryItemStore.load()
 
-	var tousseInfoGrid = new top.Ext.grid.EditorGridPanel({
-		id : 'tousseInfoGrid',
-		store : tousseInfoStore,
-		cm : tousseCm,
-		width : 700,
-		height : 400,
-		autoHeight : true,
+	var tousseInfoGrid = new top.Ext.grid.GridPanel({
+		id :'batchNumberGrid',
+		store : godownEntryItemStore ,
+		frame : false,
+		height : 300,
+		bodyStyle : 'border:1px solid #afd7af',
+		cm : columnModel,
 		autoExpandColumn : 'tousseName',
 		frame : false,
-		viewConfig: {
-			forceFit:true
-		}
+		viewConfig: {forceFit:true}
 	})
 
 	windowObj = new top.Ext.Window({
 		layout : 'fit',
-		title : '明细信息',
+		title : '【'+tousseName+'】'+titleText+'：'+count,
 		width : 700,
 		height : 400,
 		border : false,
@@ -87,7 +199,8 @@
 			endDate : endDate,
 			tousseType : tousseType,
 			sterilizationMode:sterilizationMode,
-			taskGroupName:taskGroupName
+			taskGroupName:taskGroupName,
+			modeName:'sum'
 		}
 
 		loadStoreByParams(reportFormGrid,'reportFormGrid',params);
@@ -129,11 +242,36 @@
 		});
 	}
 
-	function renderModifyFun(v, p, record){
-		//var cell = '<a class= "formDetail" href="#" onclick="checkInfo();return false;">' + v + '</a>';
-		var cell = v;
+	//申请数量渲染
+	function renderApplicationAmountModifyFun(v, p, record){
+		var count = v || 0;
+		var cell = '<a class= "formDetail" href="#" onclick="tousseInfo(\''+record.tousseName+'\',\'applicationDetails\','+count+');return false;">' + count + '</a>';
 		return cell;
 	}
+	//回收数量渲染
+	function renderRecyAmountModifyFun(v, p, record){
+		var count = v || 0;
+		var cell = '<a class= "formDetail" href="#" onclick="tousseInfo(\''+record.tousseName+'\',\'recyDetails\','+count+');return false;">' + count + '</a>';
+		return cell;
+	}
+	//发货数量渲染
+	function renderInvoiceAmountModifyFun(v, p, record){
+		var count = v || 0;
+		var cell = '<a class= "formDetail" href="#" onclick="tousseInfo(\''+record.tousseName+'\',\'invoiceDetails\','+count+');return false;">' + count + '</a>';
+		return cell;
+	}
+	//签收数量渲染
+	function renderSignAmountModifyFun(v, p, record){
+		var count = v || 0;
+		var cell = '<a class= "formDetail" href="#" onclick="tousseInfo(\''+record.tousseName+'\',\'signDetails\','+count+');return false;">' + count + '</a>';
+		return cell;
+	}
+	//使用数量渲染
+	function renderUseAmountModifyFun(v, p, record){
+		var count = v || 0;
+		var cell = '<a class= "formDetail" href="#" onclick="tousseInfo(\''+record.tousseName+'\',\'useDetails\','+count+');return false;">' + count + '</a>';
+		return cell;
+	}
 
 	//器械包分组combo的store
 	var tousseGroupStore = new Ext.data.JsonStore({
@@ -158,7 +296,6 @@
 			,['foreign','外来器械包']
 			,['custom','自定义器械包']
 			,['foreignProxy','外部代理灭菌包']
-			,['disposableGood','一次性物品']
 		]
 	});
 
@@ -380,11 +517,11 @@
 
 	var applicationColumns = [
 		{header : "器械包名称",width : 180,dataIndex : 'tousseName'},
-		{header : "申请数量",width : 60,dataIndex : 'applicationAmount',renderer : renderModifyFun}, 
-		{header : "回收数量",width : 60,dataIndex : 'recyAmount',renderer : renderModifyFun}, 
-		{header : "发货数量",width : 60,dataIndex : 'invoiceAmount',renderer : renderModifyFun},
-		{header : "签收数量",width : 130,dataIndex : 'signAmount',renderer : renderModifyFun},
-		{header : "使用数量",width : 130,dataIndex : 'useAmount',renderer : renderModifyFun}
+		{header : "申请数量",width : 80,dataIndex : 'applicationAmount',renderer : renderApplicationAmountModifyFun}, 
+		{header : "回收数量",width : 80,dataIndex : 'recyAmount',renderer :  renderRecyAmountModifyFun}, 
+		{header : "发货数量",width : 80,dataIndex : 'invoiceAmount',renderer : renderInvoiceAmountModifyFun},
+		{header : "签收数量",width : 80,dataIndex : 'signAmount',renderer : renderSignAmountModifyFun},
+		{header : "使用数量",width : 80,dataIndex : 'useAmount',renderer :renderUseAmountModifyFun}
 	];
 
 	var height = Ext.getBody().getSize().height;
@@ -398,14 +535,15 @@
 		height:height-110,
 		columns : applicationColumns,
 		loader : new Ext.tree.TreeLoader({
-			url: WWWROOT + '/jasperreports/jasperreportsAction!getSummaryInformationOfDepartmentOperationMonitoring.do',
+			url: WWWROOT + '/jasperreports/jasperreportsAction!getInformationOfDepartmentOperationMonitoring.do',
 			baseParams : {
 				startDate : defaultStartDate,
 				endDate :  defaultEndDate,
 				goodsName : '',
 				tousseType : '',
 				sterilizationMode : '',
-				taskGroupName : ''
+				taskGroupName : '',
+				modeName:'sum'
 			},
 			uiProviders:{
 				'col': top.Ext.tree.ColumnNodeUI