Index: ssts-web/src/main/webapp/homepage/supplyRoomOperate.js =================================================================== diff -u -r26370 -r26747 --- ssts-web/src/main/webapp/homepage/supplyRoomOperate.js (.../supplyRoomOperate.js) (revision 26370) +++ ssts-web/src/main/webapp/homepage/supplyRoomOperate.js (.../supplyRoomOperate.js) (revision 26747) @@ -5,7 +5,10 @@ var packingStore; var reviewStore; var sterilizationStore; -var invoicePlanStore; +//器械包发货数据源(GGSRMYY-101 消毒供应中心运作监控，发货信息列表将一次性物品和器械包分开显示) +var tousseInvoiceStore; +//一次性物品发货数据源(GGSRMYY-101 消毒供应中心运作监控，发货信息列表将一次性物品和器械包分开显示) +var disposableInvoiceStore; var totalCount = 10; var IDS =Ext.id(); var jsonreader = new micJsonReader({ @@ -89,7 +92,10 @@ packingStore.removeAll(); reviewStore.removeAll(); sterilizationStore.removeAll(); - invoicePlanStore.removeAll(); + + //(GGSRMYY-101 消毒供应中心运作监控，发货信息列表将一次性物品和器械包分开显示) + tousseInvoiceStore.removeAll(); + disposableInvoiceStore.removeAll(); var queryParam = { tousseName : goodName, @@ -105,7 +111,10 @@ loadStoreByParams(packingStore, queryParam); loadStoreByParams(reviewStore, queryParam); loadStoreByParams(sterilizationStore, queryParam); - loadStoreByParams(invoicePlanStore, queryParam); + + //(GGSRMYY-101 消毒供应中心运作监控，发货信息列表将一次性物品和器械包分开显示)(GGSRMYY-101 消毒供应中心运作监控，发货信息列表将一次性物品和器械包分开显示) + loadStoreByParams(tousseInvoiceStore, queryParam); + loadStoreByParams(disposableInvoiceStore, queryParam); } /** @@ -332,7 +341,7 @@ displayField : 'value', store : tousseTypeStore, forceSelection : true, - value:'全部', + value:'all',//需要改成all,否则如果没有选择此下拉框的选项直接点查询时传到后台是"全部",不是"all" editable : false, mode : 'local', triggerAction : 'all', @@ -506,8 +515,8 @@ {header : "开始时间",width : 130,dataIndex : 'startDate'}, {header : "结束时间",width : 130,dataIndex : 'endDate'} ]); - //发货信息 - var invoicePlanColumns = new Ext.grid.ColumnModel([ + //器械包发货信息(GGSRMYY-101 消毒供应中心运作监控，发货信息列表将一次性物品和器械包分开显示) + var tousseInvoiceColumns = new Ext.grid.ColumnModel([ {header : "器械包名称",width : 200,dataIndex : 'tousseName', renderer :renderCallShowInvoiceShowFun}, {header : "数量",width : 50,dataIndex : 'amount'}, {header : "发货流水号",width : 50,dataIndex : 'serialNumber',hidden:true}, @@ -519,6 +528,19 @@ {header : "发往科室",width : 200,dataIndex : 'depart'} ]); + //一次性物品发货信息(GGSRMYY-101 消毒供应中心运作监控，发货信息列表将一次性物品和器械包分开显示) + var disposableInvoiceColumns = new Ext.grid.ColumnModel([ + {header : "一次性物品名称",width : 200,dataIndex : 'tousseName', renderer :renderCallShowInvoiceShowFun}, + {header : "数量",width : 50,dataIndex : 'amount'}, + {header : "发货流水号",width : 50,dataIndex : 'serialNumber',hidden:true}, + {header : "申请人",width : 50,dataIndex : 'applicant',hidden:true}, + {header : "发货员",width : 80,dataIndex : 'sender'}, + {header : "发货时间",width : 150,dataIndex : 'senderTime'}, + {header : "申请时间",width : 50,dataIndex : 'applicationTime',hidden:true}, + {header : "发货单号",width : 50,dataIndex : 'id',hidden:true}, + {header : "发往科室",width : 200,dataIndex : 'depart'} + ]); + applicationStore = new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ url : WWWROOT + '/disinfectSystem/supplyRoomControlAction!searchRecyclingApplication.do', @@ -594,21 +616,40 @@ var newTitle = "灭菌信息"+"(灭菌总数：" + sterilizationTotalAmount + ")"; Ext.getCmp('sterilizationGrid').setTitle(newTitle); }); - - invoicePlanStore = new Ext.data.Store({ + + //(GGSRMYY-101 消毒供应中心运作监控，发货信息列表将一次性物品和器械包分开显示) + tousseInvoiceStore = new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ - url : WWWROOT + '/disinfectSystem/supplyRoomControlAction!searchInvoice.do', + url : WWWROOT + '/disinfectSystem/supplyRoomControlAction!searchTousseInvoice.do', method : 'POST' }), reader:jsonreader }); - - invoicePlanStore.on("load",function(thiz,records,options){ - var o = Ext.decode(invoicePlanStore.reader.responseText); + + //(GGSRMYY-101 消毒供应中心运作监控，发货信息列表将一次性物品和器械包分开显示) + disposableInvoiceStore = new Ext.data.Store({ + proxy : new Ext.data.HttpProxy({ + url : WWWROOT + '/disinfectSystem/supplyRoomControlAction!searchDisposableInvoice.do', + method : 'POST' + }), + reader:jsonreader + }); + + //(GGSRMYY-101 消毒供应中心运作监控，发货信息列表将一次性物品和器械包分开显示) + tousseInvoiceStore.on("load",function(thiz,records,options){ + var o = Ext.decode(tousseInvoiceStore.reader.responseText); var invoiceTotalAmount = o.invoiceTotalAmount; - var newTitle = "发货信息"+"(发货总数：" + invoiceTotalAmount + ")"; - Ext.getCmp('invoicePlanGrid').setTitle(newTitle); + var newTitle = "器械包发货信息"+"(发货总数：" + invoiceTotalAmount + ")"; + Ext.getCmp('tousseInvoiceGrid').setTitle(newTitle); }); + + //(GGSRMYY-101 消毒供应中心运作监控，发货信息列表将一次性物品和器械包分开显示) + disposableInvoiceStore.on("load",function(thiz,records,options){ + var o = Ext.decode(disposableInvoiceStore.reader.responseText); + var invoiceTotalAmount = o.invoiceTotalAmount; + var newTitle = "一次性物品发货信息"+"(发货总数：" + invoiceTotalAmount + ")"; + Ext.getCmp('disposableInvoiceGrid').setTitle(newTitle); + }); var applicationPageBbar = new Ext.PagingToolbar({ pageSize: 10,//指出每页显示的记录数 @@ -646,13 +687,24 @@ displayMsg: '当前显示记录: {0} - {1} 共计: {2}', emptyMsg: "没有记录可以显示" }); - var invoicePlanPageBbar = new Ext.PagingToolbar({ + + //(GGSRMYY-101 消毒供应中心运作监控，发货信息列表将一次性物品和器械包分开显示) + var tousseInvoicePageBbar = new Ext.PagingToolbar({ pageSize: 10,//指出每页显示的记录数 - store :invoicePlanStore, + store :tousseInvoiceStore, displayInfo: true, displayMsg: '当前显示记录: {0} - {1} 共计: {2}', emptyMsg: "没有记录可以显示" }); + + //(GGSRMYY-101 消毒供应中心运作监控，发货信息列表将一次性物品和器械包分开显示) + var disposableInvoicePageBbar = new Ext.PagingToolbar({ + pageSize: 10,//指出每页显示的记录数 + store :disposableInvoiceStore, + displayInfo: true, + displayMsg: '当前显示记录: {0} - {1} 共计: {2}', + emptyMsg: "没有记录可以显示" + }); var applicationGrid = new Ext.grid.GridPanel({ title:'回收申请信息', @@ -740,23 +792,44 @@ } } }); - var invoicePlanGrid = new Ext.grid.GridPanel({ + + //(GGSRMYY-101 消毒供应中心运作监控，发货信息列表将一次性物品和器械包分开显示) + var tousseInvoiceGrid = new Ext.grid.GridPanel({ title:'发货信息', anchor:'100% 100%', frame : false, - id : 'invoicePlanGrid', + id : 'tousseInvoiceGrid', autoScroll:true, - store : invoicePlanStore, - cm : invoicePlanColumns, + store : tousseInvoiceStore, + cm : tousseInvoiceColumns, bodyStyle: "overflow:auto;", - bbar:invoicePlanPageBbar, + bbar:tousseInvoicePageBbar, listeners :{ beforerender :function(thiz){ var tempGrid = Ext.getCmp('reportFormID'); thiz.setHeight(tempGrid.getInnerHeight()); } } }); + + //(GGSRMYY-101 消毒供应中心运作监控，发货信息列表将一次性物品和器械包分开显示) + var disposableInvoiceGrid = new Ext.grid.GridPanel({ + title:'发货信息', + anchor:'100% 100%', + frame : false, + id : 'disposableInvoiceGrid', + autoScroll:true, + store : disposableInvoiceStore, + cm : disposableInvoiceColumns, + bodyStyle: "overflow:auto;", + bbar:disposableInvoicePageBbar, + listeners :{ + beforerender :function(thiz){ + var tempGrid = Ext.getCmp('reportFormID'); + thiz.setHeight(tempGrid.getInnerHeight()); + } + } + }); var reportForm = new Ext.form.FormPanel({ id:'reportFormID', @@ -799,10 +872,15 @@ }] },{ layout : 'column', + //(GGSRMYY-101 消毒供应中心运作监控，发货信息列表将一次性物品和器械包分开显示) items:[{ - columnWidth : .98, + columnWidth : .49, layout : 'form', - items : [invoicePlanGrid] + items : [tousseInvoiceGrid] + },{ + columnWidth : .49, + layout : 'form', + items : [disposableInvoiceGrid] }] }] });