Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js =================================================================== diff -u -r36315 -r36563 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js (.../departmentMonthlyView.js) (revision 36315) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js (.../departmentMonthlyView.js) (revision 36563) @@ -12,7 +12,7 @@ var departMode; var is2Column = false; var widthArr = []; - +var hiddenExportButton = false; function getTableHtml(data, titleInfoArr, branchesOfHospitalInfo) { if (sstsConfig.enableWheterToChargeFieldOfDisposableGoods) { var headerArr = {}; @@ -526,17 +526,31 @@ } else { continue; } + if(i == 0 && (reportType == 'dgshlyyMode' || reportType == 'hiddenAmountMode' + || reportType == 'accountingMonthlyReportGroupBySterilizationMode' + || reportType == 'accountingMonthlyReportGroupByDisposableGoodsType' + || reportType == 'isHaveApplicationDepartMode' + )){ + hiddenExportButton = true; + } dataForPatternOfReport.push([reportType, optionText]); } } else if (reportTypeJson.length == 1) {//只配了显示申请科室的核算月报 - - if (reportTypeJson[0].reportName == '显示申请科室的核算月报') { + var firstReportName = reportTypeJson[0].reportName; + if (firstReportName == '显示申请科室的核算月报') { reportType = 'isHaveApplicationDepartMode'; isHaveApplicationDepartMode = true; departSearchName = "结算科室"; - } else if (reportTypeJson[0].reportName == '东莞横沥医院的核算月报') { + } else if (firstReportName == '东莞横沥医院的核算月报') { reportType = 'dgshlyyMode'; } + if(firstReportName == '东莞横沥医院的核算月报' || firstReportName == '隐藏数量的核算月报' + || firstReportName == '按灭菌方式分组统计的核算月报' + || firstReportName == '按一次性物品类型分组统计的核算月报' + || reportType == '显示申请科室的核算月报' + ){ + hiddenExportButton = true; + } } } @@ -575,7 +589,6 @@ if (reportName == '隐藏数量的核算月报') { patternOfReport = 'hiddenAmountMode'; } else if (reportName == '显示数量的核算月报') { - patternOfReport = 'showAmountMode'; } else if (reportName == '按灭菌方式分组统计的核算月报') { patternOfReport = 'accountingMonthlyReportGroupBySterilizationMode'; } else if (reportName == '按一次性物品类型分组统计的核算月报') { @@ -628,7 +641,7 @@ jasperreportName = "monthReportShowBrevityCode.jasper"; } else if ("accountingMonthlyReportGroupByDisposableGoodsType" == patternOfReport) {//按一次性物品类型拆分的核算月报 jasperreportName = "monthReportGroupByDisposableGoodsType.jasper"; - patternOfReport = "showAmountMode"; + //patternOfReport = "showAmountMode"; } else if ('accountingMonthlyReportGroupBySterilizationMode' == patternOfReport) { jasperreportName = 'monthReportGroupBySterilizationMode.jasper'; } else if (sstsConfig.enableToussePointsStatistics) { @@ -651,6 +664,8 @@ if (showAmountValue == '是') { showAmountColumn = true; } + } else if('hiddenAmountMode' == patternOfReport){ + jasperreportName = "monthReportOnlyPrice.jasper"; } else { jasperreportName = "monthReport.jasper"; if (enableMultipleBranchesOfHospital) { @@ -1087,7 +1102,8 @@ anchor: '95%', listeners: { select: function (combo, record, index) { - if (record.get('id') == 'isHaveApplicationDepartMode') { + var idValue = record.get('id'); + if (idValue == 'isHaveApplicationDepartMode') { Ext.getCmp('invoicePlanDepartId').show(); Ext.getCmp('showAmountColumnId').show(); Ext.getCmp('showApplicationDepartId').show(); @@ -1098,6 +1114,14 @@ Ext.getCmp('showApplicationDepartId').hide(); Ext.getCmp('departSearch').el.dom.parentNode.parentNode.parentNode.firstChild.innerHTML = '科室'; } + if(idValue == 'hiddenAmountMode' || idValue == 'dgshlyyMode' + || idValue == 'accountingMonthlyReportGroupBySterilizationMode' + || idValue == 'isHaveApplicationDepartMode' + || idValue == 'accountingMonthlyReportGroupByDisposableGoodsType'){ + Ext.getCmp('exportButton').hide(); + }else{ + Ext.getCmp('exportButton').show(); + } } } @@ -1173,6 +1197,7 @@ tbar: [{ text: '导出', id: 'exportButton', + hidden:hiddenExportButton, handler: function () { var html = document.getElementById('thisIframe2').contentWindow.document.getElementById('table').innerHTML; if (html !== '') {