Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r21579 -r21624 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 21579) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 21624) @@ -1445,7 +1445,9 @@ if (BooleanUtils.toBoolean(isStrengthen)) { title += String.format("消毒供应中心工作人员绩效评分表(%s~%s)", startTime, endTime); } else { - title += String.format("消毒供应中心工作量统计报表(%s~%s)", startTime, endTime); + String statisticalWorkloadName = CssdUtils.getSystemSetConfigByName("statisticalWorkloadName"); + statisticalWorkloadName = StringTools.isNotBlank(statisticalWorkloadName) ? statisticalWorkloadName : "消毒供应中心工作量统计报表"; + title += String.format("%s(%s~%s)", statisticalWorkloadName, startTime, endTime); } map.put("title", title); } else if (reportName.equals("useRecordTotalView")) {// 使用记录录入统计报表 @@ -1486,7 +1488,10 @@ String startDay = StrutsParamUtils.getPraramValue("startDay", ""); String endDay = StrutsParamUtils.getPraramValue("endDay", ""); String operator = StrutsParamUtils.getPraramValue("operator", ""); - map.put("title", "器械包工作量统计报表("+startDay+" ~ "+endDay+")"); + + String tousseWorkLoadName = CssdUtils.getSystemSetConfigByName("tousseWorkLoadName"); + tousseWorkLoadName = StringTools.isNotBlank(tousseWorkLoadName) ? tousseWorkLoadName : "器械包工作量统计报表"; + map.put("title", tousseWorkLoadName + "(" + startDay + " ~ " + endDay + ")"); if (CssdUtils.getSystemSetConfigByNameBool("tousseWorkLoadIncreasePersonnelFilter", false)) { map.put("remark", "操作员:" + (StringTools.isBlank(operator) ? "全部人员" : operator)); } else { Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js =================================================================== diff -u -r19573 -r21624 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js (.../tousseWorkLoadView.js) (revision 19573) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js (.../tousseWorkLoadView.js) (revision 21624) @@ -1,4 +1,4 @@ -var entityName = "器械包工作量统计报表"; +var entityName = sstsConfig.tousseWorkLoadName ? sstsConfig.tousseWorkLoadName : "器械包工作量统计报表"; var form; /** Index: ssts-web/src/main/webapp/disinfectsystem/config/fsfy/config.js =================================================================== diff -u -r21620 -r21624 --- ssts-web/src/main/webapp/disinfectsystem/config/fsfy/config.js (.../config.js) (revision 21620) +++ ssts-web/src/main/webapp/disinfectsystem/config/fsfy/config.js (.../config.js) (revision 21624) @@ -14,6 +14,10 @@ hideToussePriceColumn : true, // 申请界面是否隐藏一次性物品价格 hideDisposablePriceColumn : true, + //消毒供应中心工作量统计报表的表名称(默认为“消毒供应中心工作量统计报表”,用户可以自定义) + statisticalWorkloadName: '员工工作量统计报表', + //器械包工作量统计报表的表名称(默认为“器械包工作量统计报表”,用户可以自定义) + tousseWorkLoadName: '工作量统计报表', // 条码类型:1:一维码, 2:二维码 barcodeType : 2, // 申请器械包时是否自动归还待归还物品 Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.js =================================================================== diff -u -r18190 -r21624 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.js (.../statisticalWorkloadView.js) (revision 18190) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.js (.../statisticalWorkloadView.js) (revision 21624) @@ -1,5 +1,5 @@ var isStrengthen = sstsConfig.strengthenStatisticalWorkload; -var entityName = isStrengthen ? "消毒供应中心工作人员绩效评分表" : "消毒供应中心工作量统计报表"; +var entityName = isStrengthen ? "消毒供应中心工作人员绩效评分表" : (sstsConfig.statisticalWorkloadName ? sstsConfig.statisticalWorkloadName : "消毒供应中心工作量统计报表"); var form; /** Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r21579 -r21624 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 21579) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 21624) @@ -511,13 +511,13 @@ hidden:SSTS_WorkLoad_Menu, children:[ {hidden :SSTS_YearWorkload,text:"年度消毒中心指标工作量统计",href:WWWROOT+'/disinfectsystem/reportforms/yearWorkloadReportView2.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_StatisticalWorkload,text:(sstsConfig.strengthenStatisticalWorkload ? "消毒供应中心工作人员绩效评分表" : "消毒供应中心工作量统计报表"),href:WWWROOT+'/disinfectsystem/reportforms/statisticalWorkloadView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_StatisticalWorkload,text:(sstsConfig.strengthenStatisticalWorkload ? "消毒供应中心工作人员绩效评分表" : (sstsConfig.statisticalWorkloadName ? sstsConfig.statisticalWorkloadName : "消毒供应中心工作量统计报表")),href:WWWROOT+'/disinfectsystem/reportforms/statisticalWorkloadView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_USERECORD_TOTAL,text:"使用记录录入统计报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordTotalView.jsp',hrefTarget:linkTarget,leaf:true}, {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_SterilizingStoveUseCountReport,text:"灭菌炉使用次数统计报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizingStoveUseCountView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_TousseWorkLoadTotalReport,text:"器械包工作量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseWorkLoadView.jsp',hrefTarget:linkTarget,leaf:true} + {hidden :SSTS_TousseWorkLoadTotalReport,text:(sstsConfig.tousseWorkLoadName ? sstsConfig.tousseWorkLoadName : "器械包工作量统计报表"),href:WWWROOT+'/disinfectsystem/reportforms/tousseWorkLoadView.jsp',hrefTarget:linkTarget,leaf:true} ] },{