Index: ssts-web/src/main/webapp/homepage/supplyRoomOperate.jsp =================================================================== diff -u -r28443 -r28445 --- ssts-web/src/main/webapp/homepage/supplyRoomOperate.jsp (.../supplyRoomOperate.jsp) (revision 28443) +++ ssts-web/src/main/webapp/homepage/supplyRoomOperate.jsp (.../supplyRoomOperate.jsp) (revision 28445) @@ -94,6 +94,9 @@ #reportFormID .x-panel-body { overflow: auto; } + #reportFormID .x-panel-body-noheader { + overflow-y: hidden; + } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperate.js =================================================================== diff -u -r28442 -r28445 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperate.js (.../tousseOperate.js) (revision 28442) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperate.js (.../tousseOperate.js) (revision 28445) @@ -96,25 +96,6 @@ ]); 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([ - new Ext.grid.RowNumberer(), - {header : "使用时间",width : 140,dataIndex : 'useTime'}, - {header : "使用数量",width : 80,dataIndex : 'amount'}, - {header : "使用科室",width : 100,dataIndex : 'depart'}, - {header : "录入人",width : 100,dataIndex : 'operator'} - ]); - - titleText = '使用总数'; } if(count == 0){ @@ -277,12 +258,6 @@ var cell = '' + count + ''; return cell; } - //使用数量渲染 - function renderUseAmountModifyFun(v, p, record){ - var count = v || 0; - var cell = '' + count + ''; - return cell; - } //器械包分组combo的store var tousseGroupStore = new Ext.data.JsonStore({ @@ -546,8 +521,7 @@ {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} + {header : "签收数量",width : 80,dataIndex : 'signAmount',renderer : renderSignAmountModifyFun} ]; var height = (Ext.getBody().getSize().height == 0)?window.screen.height:Ext.getBody().getSize().height;