Index: ssts-web/src/main/webapp/homepage/supplyRoomOperate.jsp =================================================================== diff -u -r28408 -r28429 --- ssts-web/src/main/webapp/homepage/supplyRoomOperate.jsp (.../supplyRoomOperate.jsp) (revision 28408) +++ ssts-web/src/main/webapp/homepage/supplyRoomOperate.jsp (.../supplyRoomOperate.jsp) (revision 28429) @@ -74,11 +74,11 @@ .x-tree-root-ct.x-tree-no-lines { height: 300px; overflow-y: auto; - scrollbar-width: none; /* firefox */ - -ms-overflow-style: none; /* IE 10+ */ } - ::-webkit-scrollbar { - display: none; /* Chrome Safari */ + + div[name='divName_amount'],div[name='divName_recyclingAmount'],div[name='divName_sendOutAmount'],div[name='divName_urgentAmount']{ + text-align: right; + padding-right: 10px; } Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperate.jsp =================================================================== diff -u -r28408 -r28429 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperate.jsp (.../tousseOperate.jsp) (revision 28408) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperate.jsp (.../tousseOperate.jsp) (revision 28429) @@ -81,5 +81,10 @@ color: #367f21 !important; font-weight: 300; } + + div[name='divName_applicationAmount'],div[name='divName_recyAmount'],div[name='divName_invoiceAmount'],div[name='divName_signAmount'],div[name='divName_useAmount']{ + text-align: right; + padding-right: 10px; + } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperate.js =================================================================== diff -u -r28427 -r28429 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperate.js (.../tousseOperate.js) (revision 28427) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperate.js (.../tousseOperate.js) (revision 28429) @@ -1,7 +1,8 @@ -var entityName = "器械包运作统计"; +var entityName = "科室运作监控"; var grid; var myMask; var reportFormGrid; +var reportIndex = 0; var windowObj = null; function tousseInfo(tousseName,countType,count) { var readerJson; @@ -19,6 +20,7 @@ }); columnModel = new top.Ext.grid.ColumnModel([ + new Ext.grid.RowNumberer(), {header : "申请时间",width : 140,dataIndex : 'applicationTime'}, {header : "申请数量",width : 60,dataIndex : 'amount'}, {header : "申请科室",width : 100,dataIndex : 'depart'}, @@ -39,6 +41,7 @@ }); columnModel = new top.Ext.grid.ColumnModel([ + new Ext.grid.RowNumberer(), {header : "回收时间",width : 140,dataIndex : 'recyclingTime'}, {header : "回收数量",width : 80,dataIndex : 'recyAmount'}, {header : "申请科室",width : 130,dataIndex : 'depart'}, @@ -60,6 +63,7 @@ }); columnModel = new top.Ext.grid.ColumnModel([ + new Ext.grid.RowNumberer(), {header : "发货时间",width : 140,dataIndex : 'sendTime'}, {header : "发货数量",width : 80,dataIndex : 'invoiceAmount'}, {header : "申请科室",width : 130,dataIndex : 'depart'}, @@ -80,6 +84,7 @@ }); columnModel = new top.Ext.grid.ColumnModel([ + new Ext.grid.RowNumberer(), {header : "签收时间",width : 140,dataIndex : 'signedDate'}, {header : "条码",width : 100,dataIndex : 'barcode'}, {header : "签收科室",width : 130,dataIndex : 'depart'}, @@ -99,6 +104,7 @@ }); 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'}, @@ -214,10 +220,12 @@ function loadStoreByParams(store,title,queryParam) { var loader = store.getLoader(); loader.baseParams = queryParam; + reportIndex = 0; loader.load(store.root, function() { var length = store.root.childNodes.length; if (length <= 0) { - Ext.getCmp(title).setTitle("汇总信息"); + var newTitle = "汇总信息"+"(申请数量：0,回收数量：0,发货数量：0,签收数量：0,使用数量：0)"; + Ext.getCmp(title).setTitle(newTitle); myMask.hide(); return; } @@ -235,7 +243,7 @@ totalUseAmount += attributes.useAmount || 0; }); - var newTitle = "汇总信息"+"(申请数量" + totalApplicationAmount + ",回收数量" + totalRecyAmount + ",发货数量" + totalInvoiceAmount + ",签收数量" + totalSignAmount + ",使用数量" + totalUseAmount + ")"; + var newTitle = "汇总信息"+"(申请数量：" + totalApplicationAmount + ",回收数量：" + totalRecyAmount + ",发货数量：" + totalInvoiceAmount + ",签收数量：" + totalSignAmount + ",使用数量：" + totalUseAmount + ")"; Ext.getCmp(title).setTitle(newTitle); myMask.hide(); @@ -522,7 +530,15 @@ }] }); - var applicationColumns = [ + var reportFormColumns = [ + {xtype: 'rownumberer', width: 40, align: 'center',renderer:function(v, p, record){ + if(p.attributes.children){ + reportIndex++; + return ""+reportIndex+""; + }else { + return ''; + } + }}, {header : "器械包名称",width : 180,dataIndex : 'tousseName'}, {header : "申请数量",width : 80,dataIndex : 'applicationAmount',renderer : renderApplicationAmountModifyFun}, {header : "回收数量",width : 80,dataIndex : 'recyAmount',renderer : renderRecyAmountModifyFun}, @@ -540,7 +556,7 @@ frame : false, id : 'reportFormGrid', height:height-110, - columns : applicationColumns, + columns : reportFormColumns, loader : new Ext.tree.TreeLoader({ url: WWWROOT + '/jasperreports/jasperreportsAction!getInformationOfDepartmentOperationMonitoring.do', baseParams : { Index: ssts-web/src/main/webapp/homepage/supplyRoomOperate.js =================================================================== diff -u -r28421 -r28429 --- ssts-web/src/main/webapp/homepage/supplyRoomOperate.js (.../supplyRoomOperate.js) (revision 28421) +++ ssts-web/src/main/webapp/homepage/supplyRoomOperate.js (.../supplyRoomOperate.js) (revision 28429) @@ -1,14 +1,21 @@ var entityName = "消毒供应中心运作监控"; var grid; var applicationGrid; +var applicationIndex = 0; var washGrid; +var washIndex = 0; var packingGrid; +var packingIndex = 0; var reviewGrid; +var reviewIndex = 0; var sterilizationGrid; +var sterilizationIndex = 0; //器械包发货数据源(GGSRMYY-101 消毒供应中心运作监控，发货信息列表将一次性物品和器械包分开显示) var tousseInvoiceGrid; +var tousseInvoiceIndex = 0; //一次性物品发货数据源(GGSRMYY-101 消毒供应中心运作监控，发货信息列表将一次性物品和器械包分开显示) var disposableInvoiceGrid; +var disposableInvoiceIndex = 0; var totalCount = 10; var reviewViewText; if (sstsConfig.nameSchemeOfReviewModule == 2) { @@ -95,9 +102,40 @@ function loadStoreByParams(store, title, queryParam) { var loader = store.getLoader(); loader.baseParams = queryParam; + applicationIndex = 0; + washIndex = 0; + packingIndex = 0; + reviewIndex = 0; + sterilizationIndex = 0; + tousseInvoiceIndex = 0; + disposableInvoiceIndex = 0; loader.load(store.root, function () { var length = store.root.childNodes.length; if (length <= 0) { + var newTitle = ''; + if (title == 'applicationGrid') { + newTitle = "回收申请信息" + "(申请总数：0,回收总数：0,发货总数：0"; + + if (sstsConfig.enableUrgentFunction) { + newTitle += ",加急总数：0"; + } + + newTitle += ")"; + } else if (title == 'washGrid') { + newTitle = "清洗记录信息" + "(清洗总数：0)"; + } else if (title == 'packingGrid') { + newTitle = "装配信息" + "(装配总数：0)"; + } else if (title == 'reviewGrid') { + newTitle = "" + reviewViewText + "信息" + "(" + reviewViewText + "总数：0)"; + } else if (title == 'sterilizationGrid') { + newTitle = "灭菌信息" + "(灭菌总数：0)"; + } else if (title == 'tousseInvoiceGrid') { + newTitle = "器械包发货信息" + "(发货总数：0)"; + } else if (title == 'disposableInvoiceGrid') { + newTitle = "一次性物品发货信息" + "(发货总数：0)"; + } + + Ext.getCmp(title).setTitle(newTitle); return; } @@ -119,15 +157,15 @@ (function(p){ var parentNode = documentGetElementsByClassName($Id(title),'master-task')[i]; documentGetElementsByClassName(parentNode,'x-tree-elbow-plus')[0].onclick = function() { - var tousseName = documentGetElementsByClassName(this.parentNode,'x-tree-node-anchor')[0].innerText; + var tousseName = documentGetElementsByClassName(this.parentNode.parentNode,'x-tree-col')[1].innerText; nodeClick(store,title,queryParam,tousseName,p); } })(i); }else if(documentGetElementsByClassName(childNodes,'x-tree-elbow-end-plus').length > 0){ (function(p){ var childNodes = documentGetElementsByClassName($Id(title),'master-task')[i]; documentGetElementsByClassName(childNodes,'x-tree-elbow-end-plus')[0].onclick = function() { - var tousseName = documentGetElementsByClassName(this.parentNode,'x-tree-node-anchor')[0].innerText; + var tousseName = documentGetElementsByClassName(this.parentNode.parentNode,'x-tree-col')[1].innerText; nodeClick(store,title,queryParam,tousseName,p); } })(i); @@ -810,7 +848,15 @@ }); //回收记录信息 var applicationColumns = [ - { header: "器械包名称", width: 180, dataIndex: 'tousseName' }, + {xtype: 'rownumberer', width: 40, align: 'center',renderer:function(v, p, record){ + if(p.attributes.children){ + applicationIndex++; + return applicationIndex; + }else { + return ''; + } + }}, + { header: "器械包名称", width: 180, dataIndex: 'tousseName'}, { header: "申请数量", width: 60, dataIndex: 'amount' }, { header: "回收数量", width: 60, dataIndex: 'recyclingAmount' }, { header: "回收清洗筐", width: 140, dataIndex: 'basketName' }, @@ -821,70 +867,116 @@ { header: "申请时间", width: 130, dataIndex: 'applicationTime' }, { header: "提交时间", width: 130, dataIndex: 'submitTime' }, { header: "打印时间", width: 110, dataIndex: 'printTime' }, - { header: "备注", width: 470, dataIndex: 'remark', id: 'autoWidth' } + { header: "备注", width: sstsConfig.enableUrgentFunction?450:510, dataIndex: 'remark', id: 'autoWidth' } ]; //清洗记录信息 var washColumns = [ - { header: "器械包/材料名称", width: 170, dataIndex: 'tousseName' }, + {xtype: 'rownumberer', width: 40, align: 'center',renderer:function(v, p, record){ + if(p.attributes.children){ + washIndex++; + return washIndex; + }else { + return ''; + } + }}, + { header: "器械包/材料名称", width: 150, dataIndex: 'tousseName' }, { header: "数量", width: 50, dataIndex: 'amount'}, { header: "回收清洗筐", width: 90, dataIndex: 'basketName' }, { header: "清洗人", width: 60, dataIndex: 'operator'}, { header: "清洗机", width: 80, dataIndex: 'disinfectIdentification'}, { header: "清洗程序", width: 80, dataIndex: 'disinfectProgram'}, - { header: "开始时间", width: 150, dataIndex: 'startDate'}, - { header: "结束时间", width: 150, dataIndex: 'endDate'} + { header: "开始时间", width: 130, dataIndex: 'startDate'}, + { header: "结束时间", width: 130, dataIndex: 'endDate'}, + { width: 20} ]; //装配记录信息 var packingColumns = [ + {xtype: 'rownumberer', width: 40, align: 'center',renderer:function(v, p, record){ + if(p.attributes.children){ + packingIndex++; + return packingIndex; + }else { + return ''; + } + }}, { header: "器械包名称", width: 400, dataIndex: 'tousseName' }, { header: "数量", width: 100, dataIndex: 'amount' }, - { header: "装配人", width: 100, dataIndex: 'operator' }, - { header: "装配时间", width: 250, dataIndex: 'applicationTime' } + { header: "装配人", width: 140, dataIndex: 'operator' }, + { header: "装配时间", width: 130, dataIndex: 'applicationTime' }, + { width: 20} ]; //审核信息 var reviewColumns = [ + {xtype: 'rownumberer', width: 40, align: 'center',renderer:function(v, p, record){ + if(p.attributes.children){ + reviewIndex++; + return reviewIndex; + }else { + return ''; + } + }}, { header: "器械包名称", width: 300, dataIndex: 'tousseName' }, - { header: "数量", width: 100, dataIndex: 'amount' }, - { header: "灭菌筐", width: 100, dataIndex: 'basketName' }, + { header: "数量", width: 120, dataIndex: 'amount' }, + { header: "灭菌筐", width: 120, dataIndex: 'basketName' }, { header: "" + reviewViewText + "人", width: 100, dataIndex: 'operator' }, - { header: "" + reviewViewText + "时间", width: 250, dataIndex: 'applicationTime' } + { header: "" + reviewViewText + "时间", width: 130, dataIndex: 'applicationTime' }, + { width: 20} ]; //灭菌信息 var sterilizationColumns = [ - { header: "器械包名称", width: 130, dataIndex: 'tousseName' }, + {xtype: 'rownumberer', width: 40, align: 'center',renderer:function(v, p, record){ + if(p.attributes.children){ + sterilizationIndex++; + return sterilizationIndex; + }else { + return ''; + } + }}, + { header: "器械包名称", width: 100, dataIndex: 'tousseName' }, { header: "数量", width: 50, dataIndex: 'amount' }, - { header: "灭菌筐", width: 100, dataIndex: 'basketName' }, + { header: "灭菌筐", width: 80, dataIndex: 'basketName' }, { header: "灭菌员", width: 80, dataIndex: 'operator' }, - { header: "灭菌炉", width: 100, dataIndex: 'disinfectIdentification' }, + { header: "灭菌炉", width: 80, dataIndex: 'disinfectIdentification' }, { header: "炉次", width: 50, dataIndex: 'frequency' }, { header: "灭菌程序", width: 70, dataIndex: 'disinfectProgram' }, { header: "开始时间", width: 130, dataIndex: 'startDate' }, - { header: "结束时间", width: 130, dataIndex: 'endDate' } + { header: "结束时间", width: 130, dataIndex: 'endDate' }, + { width: 20} ]; //器械包发货信息(GGSRMYY-101 消毒供应中心运作监控，发货信息列表将一次性物品和器械包分开显示) var tousseInvoiceColumns = [ + {xtype: 'rownumberer', width: 40, align: 'center',renderer:function(v, p, record){ + if(p.attributes.children){ + tousseInvoiceIndex++; + return tousseInvoiceIndex; + }else { + return ''; + } + }}, { header: "器械包名称", width: 330, dataIndex: 'tousseName' }, { header: "数量", width: 50, dataIndex: 'amount' }, - { header: "发货流水号", width: 50, dataIndex: 'serialNumber', hidden: true }, - { header: "申请人", width: 50, dataIndex: 'applicant', hidden: true }, { header: "发货员", width: 100, 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' } + { header: "发货时间", width: 130, dataIndex: 'senderTime' }, + { header: "发往科室", width: 160, dataIndex: 'depart' }, + { width: 20} ]; //一次性物品发货信息(GGSRMYY-101 消毒供应中心运作监控，发货信息列表将一次性物品和器械包分开显示) var disposableInvoiceColumns = [ + {xtype: 'rownumberer', width: 40, align: 'center',renderer:function(v, p, record){ + if(p.attributes.children){ + disposableInvoiceIndex++; + return disposableInvoiceIndex; + }else { + return ''; + } + }}, { header: "一次性物品名称", width: 330, dataIndex: 'tousseName' }, { header: "数量", width: 50, dataIndex: 'amount' }, - { header: "发货流水号", width: 50, dataIndex: 'serialNumber', hidden: true }, - { header: "申请人", width: 50, dataIndex: 'applicant', hidden: true }, { header: "发货员", width: 100, 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' } + { header: "发货时间", width: 130, dataIndex: 'senderTime' }, + { header: "发往科室", width: 160, dataIndex: 'depart' }, + { width: 20} ]; applicationGrid = new Ext.tree.ColumnTree({ @@ -894,7 +986,6 @@ height: 350, frame: false, id: 'applicationGrid', - bodyStyle: 'border:1px solid #afd7af', columns: applicationColumns, loader: new Ext.tree.TreeLoader({ url: WWWROOT + '/disinfectSystem/supplyRoomControlAction!searchRecyclingApplicationSum.do', @@ -928,7 +1019,6 @@ height: 350, frame: false, id: 'washGrid', - bodyStyle: 'border:1px solid #afd7af', columns: washColumns, loader: new Ext.tree.TreeLoader({ url: WWWROOT + '/disinfectSystem/supplyRoomControlAction!searchWashDisinfectionSum.do', @@ -966,7 +1056,6 @@ height: 350, frame: false, id: 'packingGrid', - bodyStyle: 'border:1px solid #afd7af', columns: packingColumns, loader: new Ext.tree.TreeLoader({ url: WWWROOT + '/disinfectSystem/supplyRoomControlAction!searchPackingSum.do', @@ -1004,7 +1093,6 @@ height: 350, frame: false, id: 'reviewGrid', - bodyStyle: 'border:1px solid #afd7af', columns: reviewColumns, loader: new Ext.tree.TreeLoader({ url: WWWROOT + '/disinfectSystem/supplyRoomControlAction!searchReviewSum.do', @@ -1042,7 +1130,6 @@ height: 350, frame: false, id: 'sterilizationGrid', - bodyStyle: 'border:1px solid #afd7af', columns: sterilizationColumns, loader: new Ext.tree.TreeLoader({ url: WWWROOT + '/disinfectSystem/supplyRoomControlAction!searchSterilizationSum.do', @@ -1082,7 +1169,6 @@ height: 350, frame: false, id: 'tousseInvoiceGrid', - bodyStyle: 'border:1px solid #afd7af', columns: tousseInvoiceColumns, loader: new Ext.tree.TreeLoader({ url: WWWROOT + '/disinfectSystem/supplyRoomControlAction!searchTousseInvoiceSum.do', @@ -1122,7 +1208,6 @@ height: 350, frame: false, id: 'disposableInvoiceGrid', - bodyStyle: 'border:1px solid #afd7af', columns: disposableInvoiceColumns, loader: new Ext.tree.TreeLoader({ url: WWWROOT + '/disinfectSystem/supplyRoomControlAction!searchDisposableInvoiceSum.do',