Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperate.js =================================================================== diff -u -r28408 -r28414 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperate.js (.../tousseOperate.js) (revision 28408) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperate.js (.../tousseOperate.js) (revision 28414) @@ -395,7 +395,7 @@ title : '汇总信息', frame : false, id : 'reportFormGrid', - height:height-70, + height:height-110, columns : applicationColumns, loader : new Ext.tree.TreeLoader({ url: WWWROOT + '/jasperreports/jasperreportsAction!getSummaryInformationOfDepartmentOperationMonitoring.do', Index: ssts-web/src/main/webapp/homepage/supplyRoomOperate.js =================================================================== diff -u -r28413 -r28414 --- ssts-web/src/main/webapp/homepage/supplyRoomOperate.js (.../supplyRoomOperate.js) (revision 28413) +++ ssts-web/src/main/webapp/homepage/supplyRoomOperate.js (.../supplyRoomOperate.js) (revision 28414) @@ -217,6 +217,43 @@ }); } +function dbNodeClick(store,title,tousseName,key){ + var goodName = $Id('goodsSearch').value; + var tousseType = $Id('tousseType').value; + var department = Ext.getCmp('department').getValue(); + var orgUnitCoding = Ext.getCmp('querySupplyRoom').getValue(); + var tousseGroupName = Ext.getCmp('tousseGroupName').getValue(); + if (orgUnitCoding.indexOf(ALL) == 0) { + orgUnitCoding = ""; + } + //ie下不加IDS也能找到对应的dom + var startDate = $Id('startDate' + IDS).value || $Id('startDate').value; + var endDate = $Id('endDate' + IDS).value || $Id('endDate').value; + //任务组的displayName + var taskGroup = Ext.getCmp('taskGroup').getRawValue(); + var comboTousseType = Ext.getCmp('comboTousseType').getValue(); + + if (startDate == null || startDate == '' + || endDate == null || endDate == '') { + showResult('查询时间有误,请正确选择查询时间。'); + return false; + } + + var queryParam = { + tousseName: goodName, + tousseType: tousseType, + orgUnitCoding: orgUnitCoding, + startDate: startDate, + endDate: endDate, + taskGroup: taskGroup, + department: department, + tousseGroupName: tousseGroupName, + comboTousseType: comboTousseType + }; + + nodeClick(store,title,queryParam,tousseName,key); +} + function GetDateStr(AddDayCount, hh, mm) { var dd = new Date(); dd.setDate(dd.getDate() + AddDayCount);//获取AddDayCount天后的日期 @@ -862,7 +899,17 @@ }), root: new top.Ext.tree.AsyncTreeNode({ text: '器械包名称' - }) + }), + listeners:{ + dblclick :function(e){ + for(var i=0;i