Index: ssts-web/src/main/resources/systemset/operationDefine.xml =================================================================== diff -u -r38040 -r38058 --- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 38040) +++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 38058) @@ -550,6 +550,7 @@ + Index: ssts-web/src/main/webapp/homepage/menu.jsp =================================================================== diff -u -r38055 -r38058 --- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 38055) +++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 38058) @@ -328,7 +328,7 @@ * 《消毒供应中心质量监测报表》菜单 */ var SSTS_QualityMonitoring_Menu_1 = true; - + if (!notInWhiteList(sstsConfig, 'qualityMonitoringRelatedReports')) { SSTS_QualityMonitoring_Menu_1 = false; } @@ -362,6 +362,16 @@ /** + * 《GZSZYY-53:中医器具消毒合格率报表》权限 + */ + var SSTS_ChineseMedicineInstrTypeQuaRateReport = true; + + if (sstsConfig.enableChineseMedicineApparatusFunction) { + SSTS_ChineseMedicineInstrTypeQuaRateReport = false + } + + +/** * 《器械维修记录报表》权限 */ var SSTS_InstrumentRepairReport = true; Index: ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/menu/menuconfigure.js =================================================================== diff -u -r38051 -r38058 --- ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 38051) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 38058) @@ -649,7 +649,7 @@ {hidden :SSTS_QuotaReport,text:"十八项指标分析报表",href:WWWROOT+'/disinfectsystem/reportforms/quotaReportView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_WorkQualityCountReport,text:sstsConfig.workQualityCollectionReportConfiguration?(sstsConfig.workQualityCollectionReportConfiguration.reportName || '工作质量持续收集统计报表'):'工作质量持续收集统计报表',href:WWWROOT+'/disinfectsystem/reportforms/workQualityCollectionView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_RecycleMaterialDetailReport,text:"回收器械材料明细报表",href:WWWROOT+'/disinfectsystem/reportforms/recycleMaterialDetailView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :!sstsConfig.enableChineseMedicineApparatusFunction,text:"中医器具消毒合格率报表",href:WWWROOT+'/disinfectsystem/reportforms/chineseMedicineInstrTypeQuaRateReportView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_ChineseMedicineInstrTypeQuaRateReport,text:"中医器具消毒合格率报表",href:WWWROOT+'/disinfectsystem/reportforms/chineseMedicineInstrTypeQuaRateReportView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_WashWorkloadReport,text:"清洗区工作量及不合格率月报",href:WWWROOT+'/disinfectsystem/reportforms/washWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_WashMaterialTypeWorkloadReport,text:"清洗区材料类型工作量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialTypeWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_PackingUnqualifieReport,text:"包装区工作量及不合格率月报",href:WWWROOT+'/disinfectsystem/reportforms/packingUnqualifieReportView.jsp',hrefTarget:linkTarget,leaf:true}, Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/chineseMedicineInstrTypeQuaRateReportView.js =================================================================== diff -u -r38051 -r38058 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/chineseMedicineInstrTypeQuaRateReportView.js (.../chineseMedicineInstrTypeQuaRateReportView.js) (revision 38051) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/chineseMedicineInstrTypeQuaRateReportView.js (.../chineseMedicineInstrTypeQuaRateReportView.js) (revision 38058) @@ -115,7 +115,6 @@ params: params, success: function (response) { var result = Ext.decode(response.responseText); - console.log(result) var tableHtml = getTableHtml(result); document.getElementById('thisIframe').contentWindow.document.getElementById('table').innerHTML = tableHtml; document.getElementById('thisIframe').contentWindow.document.getElementById('ToolBar').style.display = 'block'; Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r38051 -r38058 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 38051) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 38058) @@ -752,7 +752,7 @@ {hidden :SSTS_QuotaReport,text:sstsConfig.eighteenDataIndexesReportConfiguration?(sstsConfig.eighteenDataIndexesReportConfiguration.reportName || '十八项指标分析报表'):'十八项指标分析报表',href:WWWROOT+'/disinfectsystem/reportforms/quotaReportView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_WorkQualityCountReport,text:sstsConfig.workQualityCollectionReportConfiguration?(sstsConfig.workQualityCollectionReportConfiguration.reportName || '工作质量持续收集统计报表'):'工作质量持续收集统计报表',href:WWWROOT+'/disinfectsystem/reportforms/workQualityCollectionView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_RecycleMaterialDetailReport,text:"回收器械材料明细报表",href:WWWROOT+'/disinfectsystem/reportforms/recycleMaterialDetailView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :!sstsConfig.enableChineseMedicineApparatusFunction,text:"中医器具消毒合格率报表",href:WWWROOT+'/disinfectsystem/reportforms/chineseMedicineInstrTypeQuaRateReportView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_ChineseMedicineInstrTypeQuaRateReport,text:"中医器具消毒合格率报表",href:WWWROOT+'/disinfectsystem/reportforms/chineseMedicineInstrTypeQuaRateReportView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_WashWorkloadReport,text:"清洗区工作量及不合格率月报",href:WWWROOT+'/disinfectsystem/reportforms/washWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_WashMaterialTypeWorkloadReport,text:"清洗区材料类型工作量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialTypeWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_PackingUnqualifieReport,text:"包装区工作量及不合格率月报",href:WWWROOT+'/disinfectsystem/reportforms/packingUnqualifieReportView.jsp',hrefTarget:linkTarget,leaf:true},