Index: ssts-web/src/main/webapp/homepage/supplyRoomsUnfinishedWork.js =================================================================== diff -u -r12332 -r14030 --- ssts-web/src/main/webapp/homepage/supplyRoomsUnfinishedWork.js (.../supplyRoomsUnfinishedWork.js) (revision 12332) +++ ssts-web/src/main/webapp/homepage/supplyRoomsUnfinishedWork.js (.../supplyRoomsUnfinishedWork.js) (revision 14030) @@ -2,6 +2,7 @@ var grid; var applicationStore; var washStore; +var pendingBasketStore; var packingStore; var reviewStore; var sterilizationStore; @@ -58,6 +59,9 @@ applicationStore.baseParams['department'] = department; applicationStore.load({params:{start: 0, limit: 10}}); + pendingBasketStore.baseParams['department'] = department; + pendingBasketStore.load({params:{start: 0, limit: 10}}); + packingStore.baseParams['tousseName'] = goodNmae; packingStore.baseParams['tousseType'] = tousseType; packingStore.load({params:{start: 0, limit: 10}}); @@ -222,7 +226,13 @@ {header : "回收状态",width : 65,dataIndex : 'recyclingStatus'}, {header : "发货状态",width : 65,dataIndex : 'deliverStatus'} ]); - + // 待清洗篮筐信息 + var pendingBasketColumns = new Ext.grid.ColumnModel([ + {header : "篮筐条码",width : 200,dataIndex : 'containerBarcode'}, + {header : "名称",width : 120,dataIndex : 'containerName'}, + {header : "待清洗物品数量",width : 120,dataIndex : 'unWashAmount'} +// {header : "状态",width : 60,dataIndex : 'status'} + ]); // 装配记录信息 var packingColumns = new Ext.grid.ColumnModel([ {header : "器械包名称",width : 250,dataIndex : 'tousseDefinition.name'}, @@ -290,6 +300,29 @@ var newTitle = "待回收申请单列表"+"(待回收申请单总数量:"+totalCount+")"; Ext.getCmp('applicationGrid').setTitle(newTitle); }); + // 待清洗篮筐store + pendingBasketStore = new Ext.data.Store({ + proxy : new Ext.data.HttpProxy({ + url : WWWROOT + '/disinfectSystem/supplyRoomControlAction!searchPendingBasket.do', + method : 'POST' + }), + reader: new micJsonReader({ + totalProperty : 'totalCount', + root : 'data' + },[ + {name: 'containerBarcode'}, + {name: 'containerName'}, + {name: 'unWashAmount'} +// {name: 'status'} + ]) + }); + + pendingBasketStore.on("load",function(thiz,records,options){ + var o = Ext.decode(pendingBasketStore.reader.responseText); + var totalTousseAount = o.totalPendgingBasketAount; + var newTitle = "待清洗篮筐列表"+"(待清洗篮筐总数量:" + totalTousseAount + ")"; + Ext.getCmp('pendingBasketGrid').setTitle(newTitle); + }); packingStore = new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ @@ -399,6 +432,14 @@ emptyMsg: "没有记录可以显示" }); + var pendingBasketPageBbar = new Ext.PagingToolbar({ + pageSize: 10,//指出每页显示的记录数 + store :pendingBasketStore, + displayInfo: true, + displayMsg: '当前显示记录: {0} - {1} 共计: {2}', + emptyMsg: "没有记录可以显示" + }); + var packingPageBbar = new Ext.PagingToolbar({ pageSize: 10,//指出每页显示的记录数 store :packingStore, @@ -445,6 +486,23 @@ } } }); + var pendingBasketGrid = new Ext.grid.GridPanel({ + title:'待清洗篮筐列表', + anchor:'100% 100%', + frame : false, + autoScroll:true, + store : pendingBasketStore, + id : 'pendingBasketGrid', + cm : pendingBasketColumns, + bodyStyle: "overflow:auto;", + bbar:pendingBasketPageBbar, + listeners :{ + beforerender :function(thiz){ + var tempGrid = Ext.getCmp('reportFormID'); + thiz.setHeight(tempGrid.getInnerHeight()); + } + } + }); var packingGrid = new Ext.grid.GridPanel({ title:'待装配器械包列表', @@ -537,6 +595,13 @@ items:[{ columnWidth : 1, layout : 'form', + items : [pendingBasketGrid] + }] + },{ + layout : 'column', + items:[{ + columnWidth : 1, + layout : 'form', items : [packingGrid] }] },{