Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r14543 -r14551
--- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 14543)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 14551)
@@ -275,6 +275,7 @@
+
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js
===================================================================
diff -u -r14539 -r14551
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js (.../sterilizationRecordInfoView.js) (revision 14539)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js (.../sterilizationRecordInfoView.js) (revision 14551)
@@ -51,7 +51,7 @@
var endDate = $Id('endDate').value;
var sterilizerName = Ext.getCmp('sterilizerName').getValue();
var querySupplyRoom = Ext.getCmp('querySupplyRoom').getValue();
- var sendDepart = Ext.getCmp('sendDepart').getValue();
+ var sendDepart = Ext.getCmp('sendDepart').getRawValue();
var frequency = Ext.getCmp('frequency').getValue();
myMask = new Ext.LoadMask(Ext.getBody(), {
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r14549 -r14551
--- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 14549)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 14551)
@@ -421,7 +421,7 @@
{hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材丢失明细统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialMissItemView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材报损汇总统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialDamageTotalView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材报损明细统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialDamageItemView.jsp',hrefTarget:linkTarget,leaf:true},
- {hidden :false,text:"灭菌情况报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizationRecordInfoView.jsp',hrefTarget:linkTarget,leaf:true}
+ {hidden :SSTS_SterilizationRecordInfoReport,text:"灭菌情况报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizationRecordInfoView.jsp',hrefTarget:linkTarget,leaf:true}
]
},{
text:"财务核算及物品发放报表",
Index: ssts-web/src/main/webapp/jasperRtp/sterilizationRecordReport.jasper
===================================================================
diff -u -r14539 -r14551
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/sterilizationRecordReport.jrxml
===================================================================
diff -u -r14539 -r14551
--- ssts-web/src/main/webapp/jasperRtp/sterilizationRecordReport.jrxml (.../sterilizationRecordReport.jrxml) (revision 14539)
+++ ssts-web/src/main/webapp/jasperRtp/sterilizationRecordReport.jrxml (.../sterilizationRecordReport.jrxml) (revision 14551)
@@ -93,35 +93,28 @@
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
@@ -152,36 +145,29 @@
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
@@ -199,19 +185,19 @@
-
+
-
+
-
+
Index: ssts-web/src/main/webapp/homepage/menu.jsp
===================================================================
diff -u -r14185 -r14551
--- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 14185)
+++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 14551)
@@ -84,6 +84,13 @@
}
+// 灭菌记录信息
+var SSTS_SterilizationRecordInfoReport = true;
+
+SSTS_SterilizationRecordInfoReport = false;
+
+// 灭菌记录信息
+
//材料丢失明细报表
var SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW = true;