Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/washingMachineStoveUseCountViewList.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/washingMachineStoveUseCountViewList.jsp (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/washingMachineStoveUseCountViewList.jsp (revision 27499)
@@ -0,0 +1,154 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ page import="com.forgon.tools.SpringBeanManger,org.jfree.data.general.DefaultPieDataset,org.jfree.chart.ChartFactory,org.jfree.chart.JFreeChart,org.jfree.chart.servlet.*,com.forgon.disinfectsystem.sterilizationmanager.sterilizerrecord.action.SterilizerRecordLineChartAction" %>
+<%@ page import="com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+
+
+
+
+ 清洗机使用次数
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/washingMachineStoveUseCountView.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/washingMachineStoveUseCountView.jsp (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/washingMachineStoveUseCountView.jsp (revision 27499)
@@ -0,0 +1,90 @@
+<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%@ include file="/common/taglibs.jsp"%>
+
+
+<%
+SupplyRoomConfigManager configManager =(SupplyRoomConfigManager) SpringBeanManger.getBean("supplyRoomConfigManager");
+LoginUserData userData = AcegiHelper.getLoginUser();
+String currentUserOfCoding = userData.getOrgUnitCodingFromSupplyRoomConfig();
+String orgName = userData.getOrgUnitNameCodingFromSupplyRoomConfig();
+String firstRoomCode = configManager.getFirstSupplyRoomConfig().getOrgUnitCoding();
+request.setAttribute("currentOrgCode", currentUserOfCoding);
+request.setAttribute("orgName", orgName);
+request.setAttribute("userName", userData.getUserFullName());
+if(currentUserOfCoding.equals(firstRoomCode)){
+ request.setAttribute("isFirstRoomPeople", true);
+}else{
+ request.setAttribute("isFirstRoomPeople", false);
+}
+%>
+
+<%@ include file="/common/includeExtJsAndCss.jsp"%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+清洗机使用次数统计报表
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/menu/menuconfigure.js
===================================================================
diff -u -r27163 -r27499
--- ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 27163)
+++ ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 27499)
@@ -581,6 +581,7 @@
{hidden :SSTS_USERECORD_Item,text:"使用记录录入明细报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordItemView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_USERECORD_OperatorTotal,text:"使用记录人员汇总报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordOperatorTotalView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_USERECORD_ForGoods,text:"使用记录物品分类汇总表",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordForGoodsView.jsp',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_WashingMachineStoveUseCountReport,text:"清洗机使用次数统计报表",href:WWWROOT+'/disinfectsystem/reportforms/washingMachineStoveUseCountView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_SterilizingStoveUseCountReport,text:"灭菌炉使用次数统计报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizingStoveUseCountView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_TousseWorkLoadTotalReport,text:(sstsConfig.tousseWorkLoadName ? sstsConfig.tousseWorkLoadName : "器械包工作量统计报表"),href:WWWROOT+'/disinfectsystem/reportforms/tousseWorkLoadView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_CleaningAreaWorkloadForUser,text:'清洗区人员工作量统计报表',href:WWWROOT+'/disinfectsystem/reportforms/cleaningAreaWorkloadForUser.jsp',hrefTarget:linkTarget,leaf:true},
Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r27366 -r27499
--- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 27366)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 27499)
@@ -447,6 +447,7 @@
+
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/washingMachineStoveUseCountViewYearCompar.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/washingMachineStoveUseCountViewYearCompar.jsp (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/washingMachineStoveUseCountViewYearCompar.jsp (revision 27499)
@@ -0,0 +1,153 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ page import="com.forgon.tools.SpringBeanManger,org.jfree.data.general.DefaultPieDataset,org.jfree.chart.ChartFactory,org.jfree.chart.JFreeChart,org.jfree.chart.servlet.*,com.forgon.disinfectsystem.sterilizationmanager.sterilizerrecord.action.SterilizerRecordLineChartAction" %>
+<%@ page import="com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+
+
+
+
+ 清洗机使用次数统计
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r27389 -r27499
--- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 27389)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 27499)
@@ -599,6 +599,7 @@
{hidden :SSTS_USERECORD_ForGoods,text:"使用记录物品分类汇总表",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordForGoodsView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :!sstsConfig.enableUseRecordByPatientDept,text:"使用记录物品分类汇总表(病人所在科室)",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordForGoodsAndDepartView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :!sstsConfig.enableUseRecordByPatientDept,text:"使用记录物品汇总表(病人所在科室)",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordView.jsp',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_WashingMachineStoveUseCountReport,text:"清洗机使用次数统计报表",href:WWWROOT+'/disinfectsystem/reportforms/washingMachineStoveUseCountView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_SterilizingStoveUseCountReport,text:"灭菌炉使用次数统计报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizingStoveUseCountView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_TousseWorkLoadTotalReport,text:(sstsConfig.tousseWorkLoadName ? sstsConfig.tousseWorkLoadName : "器械包工作量统计报表"),href:WWWROOT+'/disinfectsystem/reportforms/tousseWorkLoadView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_CleaningAreaWorkloadForUser,text:'清洗区人员工作量统计报表',href:WWWROOT+'/disinfectsystem/reportforms/cleaningAreaWorkloadForUser.jsp',hrefTarget:linkTarget,leaf:true},
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/washingMachineStoveUseCountView.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/washingMachineStoveUseCountView.js (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/washingMachineStoveUseCountView.js (revision 27499)
@@ -0,0 +1,460 @@
+var entityName = "清洗机使用次数统计报表";
+var grid;
+var supplyRoomStore;
+var rinserStore;
+
+var myMask;
+function reloadReport(isFirstRoomPeople,orgName,operatorSearch){
+ var departSearch = "";
+ var startTime= $Id('startTime').value;
+ var endTime = $Id('endTime').value;
+ //所选供应室名称
+ var querySupplyRoom = Ext.getCmp('querySupplyRoom').getRawValue();
+ //所选供应室编码
+ var querySupplyRoomCoding = Ext.getCmp('querySupplyRoom').getValue();
+ var queryType = Ext.getCmp('queryType').getRawValue();
+ var departCoding = Ext.getCmp('querySupplyRoom').getValue();//20181225
+ //年月
+ if(Ext.getCmp('monthSearch')){
+ var monthSearch = $Id('monthSearch').value;
+ }
+ //年份
+ if(Ext.getCmp('year')){
+ var year = $Id('year').value;
+ }
+ //清洗机
+ if(Ext.getCmp('washingMachineName')){
+ if(Ext.getCmp('washingMachineName').getValue() == "" || Ext.getCmp('washingMachineName').getValue() == undefined || Ext.getCmp('washingMachineName').getValue() == null){
+ showResult('请选择清洗机!');
+ return false;
+ }else{
+ var rinserName = Ext.getCmp('washingMachineName').getRawValue();
+ var rinserId = Ext.getCmp('washingMachineName').getValue();
+ }
+ }
+
+ if(departCoding.indexOf(ALL) == 0){
+ departCoding = "";
+ }
+ //不是一级供应室
+ if(querySupplyRoom == null || querySupplyRoom == ""){
+ showResult('请选择供应室。');
+ return false;
+ }
+ myMask = new Ext.LoadMask(Ext.getBody(), {
+ msg: '正在加载，请稍候！',
+ removeMask: true
+ });
+
+ var jasperReportName = "rinserStoveUseCount.jasper";
+ if(queryType == "明细"){
+ myMask.show();
+ jasperReportName = "rinserStoveUseCountDetail.jasper";
+ window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do" +
+ "?jasperreportName=" + jasperReportName +
+ "&reportName=rinserStoveUseCount" +
+ "&startTime=" + startTime +
+ "&endTime=" + endTime +
+ "&querySupplyRoom=" + querySupplyRoom +
+ "&querySupplyRoomCoding=" + querySupplyRoomCoding +
+ "&queryType=" + queryType,
+ 'thisIframe','_self');
+ }else if(queryType == "listChart"){//图形
+ window.open(WWWROOT+"/disinfectsystem/reportforms/washingMachineStoveUseCountViewList.jsp?querySupplyRoomCoding=" + querySupplyRoomCoding +
+ "&monthSearch=" + monthSearch +
+ "&queryType=" + queryType,
+ 'thisIframe','_self');
+ }else if(queryType == "allYearChart"){//图形对比(全年)
+ window.open(WWWROOT+"/disinfectsystem/reportforms/washingMachineStoveUseCountViewYearCompar.jsp?querySupplyRoomCoding=" + querySupplyRoomCoding +
+ "&year=" + year +
+ "&rinserId=" + rinserId +
+ "&rinserName=" + deocdeUrlParam(rinserName) +
+ "&queryType=" + queryType,
+ 'thisIframe','_self');
+ }else{
+ myMask.show();
+ window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do" +
+ "?jasperreportName=" + jasperReportName +
+ "&reportName=rinserStoveUseCount" +
+ "&startTime=" + startTime +
+ "&endTime=" + endTime +
+ "&querySupplyRoom=" + querySupplyRoom +
+ "&querySupplyRoomCoding=" + querySupplyRoomCoding +
+ "&queryType=" + queryType,
+ 'thisIframe','_self');
+ }
+}
+
+Ext.onReady(function(){
+ Ext.QuickTips.init();
+ var supplyRoomRecord = Ext.data.Record.create([
+ {name: 'departCode', type: 'string'},
+ {name: 'name', type: 'string'}
+ ]);
+
+ var supplyRoomStore = new Ext.data.SimpleStore({
+ fields : ['departCode','name']
+ });
+
+ var loadMask;
+ /**
+ * “供应室combo”的store,仅用于普通的ajax请求的数据源
+ */
+ var supplyRoomRemoteStore = new Ext.data.Store({
+ proxy : new Ext.data.HttpProxy({
+ url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfigRoom.do',
+ method : 'POST'
+ }),
+ baseParams :{type:"12"},
+ reader : new Ext.data.JsonReader({
+ fields : [
+ {name : 'id', mapping : 'id'},
+ {name : 'departCode', mapping : 'departId'},
+ {name : 'name', mapping : 'name'}
+ ]
+ }),
+ beforeload : function(){
+ loadMask = new Ext.LoadMask(Ext.getBody(), {
+ msg: '正在加载供应室...，请稍候！',removeMask: true
+ });
+ loadMask.show();
+ },
+ listeners:{
+ beforeload : function(){
+ loadMask = new Ext.LoadMask(Ext.getBody(), {
+ msg: '正在加载供应室...，请稍候！',removeMask: true
+ });
+ loadMask.show();
+ },
+ load :function (thiz,records,options ){
+ loadMask.hide();
+ var currentOrgUnitIsSupplyRoom = false;
+ if(records && records.length > 0){
+ for (var i = 0; i < records.length; i++) {
+ var supplyRoomData = records[i].data;
+ var departCodeTemp = supplyRoomData.departCode;
+ //如果没有查看其它供应室权限时,只显示是当前用户的科室
+ if(SSTS_View_All_Supply_Room_Report){
+ if(departCodeTemp == currentOrgUnitCoding){
+ supplyRoomStore.add(new supplyRoomRecord({'departCode':departCodeTemp,'name':supplyRoomData.name}));
+ currentOrgUnitIsSupplyRoom = true;
+ }
+ }else{
+ supplyRoomStore.add(new supplyRoomRecord({'departCode':departCodeTemp,'name':supplyRoomData.name}));
+ if(departCodeTemp == currentOrgUnitCoding){
+ currentOrgUnitIsSupplyRoom = true;
+ }
+ }
+ }
+ }
+ if(supplyRoomStore.getCount() > 1){
+ supplyRoomStore.insert(0 , new supplyRoomRecord({'departCode':ALL,'name':ALL}));
+ }
+ //最后使供应室下拉框默认选中用户所属的当前的科室(前提是用户所属的当前的科室也在选项中)
+ if(currentOrgUnitIsSupplyRoom){
+ Ext.getCmp('querySupplyRoom').setValue(currentOrgUnitCoding);
+ }
+ }
+ }
+ });
+ supplyRoomRemoteStore.load();
+
+ rinserStore = new Ext.data.Store({
+ proxy : new Ext.data.HttpProxy({
+ url : WWWROOT+ '/disinfectSystem/baseData/rinserAction!getAllRinserInfo.do',
+ method : 'POST'
+ }),
+ reader : new Ext.data.JsonReader({
+ root : 'data'
+ }, [{name : 'id',mapping : 'id'},
+ {name : 'name',mapping : 'name'}]
+ )
+ });
+ rinserStore.load();
+
+ function isShowDom(parentId,id){
+ if(Ext.getCmp(id)){
+ Ext.getCmp(parentId).remove(id);
+ }
+ }
+ var dt = new Date();
+ var startDayofMonth = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/01";
+
+ var form = new Ext.form.FormPanel({
+ title : '清洗机使用次数统计报表',
+ region : 'north',
+ labelAlign : 'right',
+ buttonAlign : 'center',
+ collapsible : true,
+ collapseMode : 'mini',
+ split : true,
+ border : 0,
+ frame : true,
+ bodyStyle : 'padding:0px auto;margin:0px',// padding:1px;padding-top:5px;
+ height : 160,
+ items : [{
+ layout : 'column',
+ id:"wrapperAll",
+ width : 1000,
+ items : [{
+ layout:'form',
+ columnWidth:.25,
+ labelWidth : 80,
+ labelSeparator : ':',
+ items : [{//20181225
+ xtype : 'multiSelect',
+ id : 'querySupplyRoom',
+ name : 'querySupplyRoom',
+ valueField : 'departCode',
+ displayField : 'name',
+ minChars : 0,
+ allowBlank : true,
+ editable : false,
+ store : supplyRoomStore,
+ forceSelection : false,
+ mode : 'local',
+ triggerAction : 'all',
+ lazyInit : true,
+ typeAhead : false,
+ fieldLabel : "选择供应室",
+ anchor : '95%',
+ listeners: {
+ select: function (combo, record, index) {
+ //1、如果选中“全部”的项，则把所有的项选中，反之全部取消选择
+ if (record.get('departCode') == ALL) {
+ if (record.get('checked')) {
+ combo.selectAll();
+ } else {
+ combo.deselectAll();
+ }
+ }
+
+ //2、如果已经选中所有的项，则把“全部”项选中，反之把“全部”项取消选择
+ var selectAll = true;
+ combo.store.each(function(record) {
+ if (record.get('departCode') != ALL && !record.get(this.checkField)) {
+ selectAll = false;
+ return;
+ }
+ }, combo);
+
+ var all = combo.store.getAt(0);
+ if (selectAll) {
+ all.set(combo.checkField, true);
+ } else {
+ all.set(combo.checkField, false);
+ }
+ combo.setValue(combo.getCheckedValue());
+ }
+ }
+
+ }]
+ },{
+ layout:'form',
+ columnWidth:0.25,
+ id:"startTimeWrapper",
+ labelWidth:80,
+ items:[{
+ xtype : 'datefieldWithMin',
+ fieldLabel : '开始日期',
+ id : 'startTime',
+ name : 'startTime',
+ editable : false,
+ format : 'Y-m-d H:i',
+ altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+ allowBlank : true,
+ anchor : '95%',
+ width:150,
+ value: new Date(startDayofMonth),
+ theHours : 0,
+ theMinutes : 0,
+ listeners : {
+ specialkey : function(field, e) {
+ if (e.getKey() == Ext.EventObject.ENTER) {
+ var isOK = field.validate();
+ if(isOK){
+ var value = field.getValue();
+ field.setValue(value);
+ var endTime = Ext.getCmp('endTime');
+ endTime.setValue('');
+ endTime.focus();
+ }
+ }
+ }
+ }
+ }]
+ },{
+ layout:'form',
+ columnWidth:0.25,
+ id:"endTimeWrapper",
+ labelWidth:80,
+ items:[{
+ xtype : 'datefieldWithMin',
+ fieldLabel : '结束日期',
+ id : 'endTime',
+ name : 'endTime',
+ editable : false,
+ format : 'Y-m-d H:i',
+ allowBlank : true,
+ anchor : '95%',
+ width:150,
+ value: new Date(),
+ theHours : 23,
+ theMinutes : 59,
+ listeners : {
+ specialkey : function(field, e) {
+ if (e.getKey() == Ext.EventObject.ENTER) {
+ var isOK = field.validate();
+ if(isOK){
+ var value = field.getValue();
+ field.setValue(value);
+ }
+ }
+ }
+ }
+ }]
+ },{
+ layout : 'form',
+ columnWidth:1,
+ labelWidth:80,
+ items : [new Ext.ux.RadioGroup({
+ fieldLabel : "查询类型",
+ allowBlank : false,
+ horizontal:true,
+ defaultValue:'汇总',
+ name : "queryType",
+ id : "queryType",
+ anchor : '95%',
+ listWidth : 400,
+ radios:[{boxLabel:'汇总',value:'汇总'},
+ {boxLabel:'明细',value:'明细'},
+ {boxLabel:'图形',value:'listChart'},
+ {boxLabel:'图形对比(全年)',value:'allYearChart'}
+ ],
+ listeners:{
+ 'change':function(v,p,group,checked){
+ if(group == "listChart"){
+ Ext.getCmp("startTimeWrapper").hide(); //隐藏开始日期
+ Ext.getCmp("endTimeWrapper").hide(); //隐藏结束日期
+ //隐藏年份，灭菌炉
+ isShowDom("wrapperAll","yearWrapper");
+ isShowDom("wrapperAll","washingMachineNameWrapper");
+ //显示年月
+ var monthSearchWrapper = {
+ layout:'form',
+ labelWidth :40,
+ columnWidth:.25,
+ id:"monthSearchWrapper",
+ items : [new Ext.form.DateField({
+ id:'monthSearch',
+ name : 'monthSearch',
+ fieldLabel : '年月',
+ readOnly : true,
+ format:'Y-m',
+ value : new Date(),
+ anchor : '95%'
+ })]
+ }
+
+ Ext.getCmp("wrapperAll").insert(Ext.getCmp("wrapperAll").items.length - 2,monthSearchWrapper);
+ Ext.getCmp("wrapperAll").doLayout();
+ }else if(group == "allYearChart"){
+ Ext.getCmp("startTimeWrapper").hide(); //隐藏开始日期
+ Ext.getCmp("endTimeWrapper").hide(); //隐藏结束日期
+ isShowDom("wrapperAll","monthSearchWrapper");
+ //显示年份
+ var yearWrapper = {
+ layout : 'form',
+ columnWidth:.2,
+ labelWidth :40,
+ id:"yearWrapper",
+ items : [
+ new Ext.ux.MonthField({
+ id:'year',
+ name : 'year',
+ fieldLabel : '年份',
+ readOnly : true,
+ format:'Y',
+ value : new Date(),
+ anchor : '65%'
+ })]
+ }
+
+ //显示清洗机
+ var washingMachineNameWrapper = {
+ layout:'form',
+ columnWidth:0.25,
+ labelSeparator : '请选择清洗机:',
+ id:"washingMachineNameWrapper",
+ items:[{
+ id : 'washingMachineName',
+ name : 'washingMachineName',
+ xtype : 'combo',
+ valueField : 'id',
+ displayField : 'name',
+ store : rinserStore,
+ triggerAction : 'all',
+ mode : 'remote',
+ listWidth:200,
+ editable : false,
+ forceSelection : true,
+ allowBlank : true,
+ anchor : '95%'
+ }]
+ }
+ Ext.getCmp("wrapperAll").insert(Ext.getCmp("wrapperAll").items.length - 2,yearWrapper);
+ Ext.getCmp("wrapperAll").insert(Ext.getCmp("wrapperAll").items.length - 1,washingMachineNameWrapper);
+ Ext.getCmp("wrapperAll").doLayout();
+ }else{
+ Ext.getCmp("startTimeWrapper").show(); //显示开始日期
+ Ext.getCmp("endTimeWrapper").show(); //显示结束日期
+
+ //隐藏年月，年份，灭菌炉
+ isShowDom("wrapperAll","monthSearchWrapper");
+ isShowDom("wrapperAll","yearWrapper");
+ isShowDom("wrapperAll","washingMachineNameWrapper");
+ }
+ }
+ }
+ }) ]
+ }]
+ }],
+ buttons:[{
+ xtype : 'button',
+ text : '查询',
+ minWidth : 70,
+ iconCls : 'icon_search',
+ handler : function() {
+ reloadReport();
+ }
+ },{
+
+ xtype : 'button',
+ text : '重置',
+ minWidth : 70,
+ iconCls : 'icon_set',
+ handler : function() {
+ form.getForm().reset();
+ }
+ }]
+ });
+
+ var reportForm = new Ext.Panel({
+ frame:false,//渲染面板
+ autoScroll:true,//自动显示滚动条
+ collapsible:true,//允许展开和收缩
+ bodyPadding:5,
+ html:''
+
+ });
+
+ var viewport = new Ext.Viewport({
+ layout : 'border',
+ items : [form, {
+ region : 'center',
+ margins : '0 0 0 0',
+ layout : 'fit',
+ items : reportForm
+ }]
+ });
+});
\ No newline at end of file
Index: ssts-web/src/main/webapp/homepage/menu.jsp
===================================================================
diff -u -r27340 -r27499
--- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 27340)
+++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 27499)
@@ -149,7 +149,7 @@
* 《消毒供应中心工作量统计报表》菜单
*/
var SSTS_WorkLoad_Menu = true;
-
+
if (!notInWhiteList(sstsConfig, 'workloadStatisticsRelatedReports')) {
SSTS_WorkLoad_Menu = false;
}
@@ -219,6 +219,16 @@
/**
+ * 《清洗机使用次数统计报表》权限
+ */
+var SSTS_WashingMachineStoveUseCountReport = true;
+
+SSTS_WashingMachineStoveUseCountReport = false;
+
+
+
+
+/**
* 《器械包工作量统计报表》权限
*/
var SSTS_TousseWorkLoadTotalReport = true;