Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.jsp =================================================================== diff -u -r31282 -r35469 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.jsp (.../materialTypeWorkloadReportView.jsp) (revision 31282) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.jsp (.../materialTypeWorkloadReportView.jsp) (revision 35469) @@ -5,6 +5,13 @@ <%@ include file="/common/includeExtJsAndCss.jsp"%> + + + + + + + Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js =================================================================== diff -u -r34188 -r35469 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js (.../materialTypeWorkloadReportView.js) (revision 34188) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js (.../materialTypeWorkloadReportView.js) (revision 35469) @@ -11,25 +11,27 @@ var newLegendData = []; var maxArr = []; var data = {}; - html += ""; - html += ""; + html += "
日期
"; + html += ""; + html += ""; + html += ""; for (var i = 0; i < resultData.header.length; i++) { - html += ""; + html += ""; legendData.push(resultData.header[i].split(',')[0]); } - html += ""; + html += ""; html += ""; - html += ""; + html += ""; html += ""; html += ""; for (var item in resultData.dayOfMonthMap) { - if(item.split('-').length >= 3){ + if (item.split('-').length >= 3) { xAxisData.push(parseInt(item.split('-')[2])); - }else { - xAxisData.push(parseInt(item.split('-')[1])+'月'); + } else { + xAxisData.push(parseInt(item.split('-')[1]) + '月'); } html += ""; - html += ""; + html += ""; for (var i = 0; i < resultData.header.length; i++) { var materialType = resultData.header[i].split(',')[0]; var amount = 0; @@ -49,31 +51,29 @@ } else { data[materialType] = [washUnqualifiedPercentage]; } - - html += ""; - html += ""; - html += ""; + + html += ""; + html += ""; + html += ""; } if (resultData.sumData[item]) { - html += ""; - html += ""; - html += ""; + html += ""; + html += ""; + html += ""; } html += ""; } - html += ""; - html += ""; - html += ""; + html += ""; for (var i = 0; i < resultData.header.length; i++) { var materialType = resultData.header[i].split(',')[0]; if (resultData.materialTypeMap[materialType]) { - html += ""; - html += ""; - html += ""; + html += ""; + html += ""; + html += ""; } else { - html += ""; - html += ""; - html += ""; + html += ""; + html += ""; + html += ""; } if (resultData.materialTypeMap[materialType].washUnqualifiedPercentage > 0) { seriesData.push({ @@ -84,12 +84,12 @@ } } if (resultData.sumData['合计']) { - html += ""; - html += ""; - html += ""; + html += ""; + html += ""; + html += ""; } html += ""; - html += ""; + html += ""; html += "
日期" + resultData.header[i].split(',')[0] + "" + resultData.header[i].split(',')[0] + "合计合计
清洗数量不合格数不合格率
清洗数量不合格数不合格率
" + item + "" + item + "" + amount + "" + washUnqualifiedAmount + "" + parseFloat(washUnqualifiedPercentage).toFixed(4) + "%" + amount + "" + washUnqualifiedAmount + "" + parseFloat(washUnqualifiedPercentage).toFixed(4) + "%" + resultData.sumData[item].amount + "" + resultData.sumData[item].washUnqualifiedAmount + "" + parseFloat(resultData.sumData[item].washUnqualifiedPercentage).toFixed(4) + "%" + resultData.sumData[item].amount + "" + resultData.sumData[item].washUnqualifiedAmount + "" + parseFloat(resultData.sumData[item].washUnqualifiedPercentage).toFixed(4) + "%
合计
合计" + resultData.materialTypeMap[materialType].amount + "" + resultData.materialTypeMap[materialType].washUnqualifiedAmount + "" + parseFloat(resultData.materialTypeMap[materialType].washUnqualifiedPercentage).toFixed(4) + "%" + resultData.materialTypeMap[materialType].amount + "" + resultData.materialTypeMap[materialType].washUnqualifiedAmount + "" + parseFloat(resultData.materialTypeMap[materialType].washUnqualifiedPercentage).toFixed(4) + "%" + resultData.sumData['合计'].amount + "" + resultData.sumData['合计'].washUnqualifiedAmount + "" + parseFloat(resultData.sumData['合计'].washUnqualifiedPercentage).toFixed(4) + "%" + resultData.sumData['合计'].amount + "" + resultData.sumData['合计'].washUnqualifiedAmount + "" + parseFloat(resultData.sumData['合计'].washUnqualifiedPercentage).toFixed(4) + "%
"; var res = { legendData: newLegendData, @@ -182,14 +182,14 @@ } if (timeType == '年月') { yearSearch = '' - if(monthSearch == ''){ + if (monthSearch == '') { showResult("请选择年月"); Ext.getCmp('monthSearch').focus(); return; } } else { monthSearch = ''; - if(yearSearch == ''){ + if (yearSearch == '') { showResult("请选择年份"); Ext.getCmp('yearSearch').focus(); return; @@ -219,7 +219,7 @@ } params.instrumentSetTypes = instrumentSetTypes; } - + Ext.Ajax.request({ url: url, params: params, @@ -228,10 +228,10 @@ if (!result.success || result.data.dataList.length == 0) { document.getElementById('thisIframe').contentWindow.document.getElementById("table").innerHTML = ""; document.getElementById('thisIframe').contentWindow.document.getElementById("echartJs").style.display = "none"; - if(!result.success){ - if(result.message != ''){ + if (!result.success) { + if (result.message != '') { showResult(result.message); - }else{ + } else { showResult('查询异常'); } myMask.hide(); @@ -278,7 +278,7 @@ formatter: '%' } if (sstsConfig.enableTheHistogramDisplayOfCleaningAreaMaterialTypeWorkloadStatisticsReport && !isIE()) { - createCharts(document.getElementById('thisIframe'),chartsData); + createCharts(document.getElementById('thisIframe'), chartsData); } document.getElementById('thisIframe').contentWindow.document.getElementById("table").innerHTML = res.html; @@ -436,7 +436,7 @@ } }] }] - },{ + }, { layout: 'form', width: 300, hidden: !sstsConfig.enableInstrumentSetTypeSetting, @@ -486,15 +486,15 @@ iconCls: 'icon_set', handler: function () { Ext.getCmp('yearSearch').setValue(new Date()); - Ext.getCmp('monthSearch').setValue( new Date()); + Ext.getCmp('monthSearch').setValue(new Date()); Ext.getCmp('timeType').setValue('年月'); Ext.getCmp('yearSearch_id').hide(); Ext.getCmp('monthSearch_id').show(); //最后使供应室下拉框默认选中用户所属的当前的科室(前提是用户所属的当前的科室也在选项中) if (currentOrgUnitIsSupplyRoom) { Ext.getCmp('querySupplyRoom').setValue(currentOrgUnitCoding); } - if(sstsConfig.enableInstrumentSetTypeSetting){ + if (sstsConfig.enableInstrumentSetTypeSetting) { Ext.getCmp('tousseSetTypeName').setValue(''); Ext.getCmp('instrumentSetTypes').setValue(''); } @@ -510,7 +510,30 @@ tbar: [{ text: '导出', handler: function () { - exportCharts(document.getElementById('thisIframe')); + var html = document.getElementById('thisIframe').contentWindow.document.getElementById('table').innerHTML; + if (html !== '') { + var timeType = Ext.getCmp('timeType').getValue(); + var time = ''; + if (timeType == '年份') { + time = Ext.getCmp('yearSearch').getRawValue(); + } else { + time = Ext.getCmp('monthSearch').getRawValue(); + } + var title = '清洗区材料类型工作量统计报表 ' + time; + var data = { + fileName: title, + fileType: ".xls",//文档类型 经测试 可以doc xls html 其他的自己去试 + html: html + } + exportMask = new Ext.LoadMask(Ext.getBody(), { + msg: '正在导出文件，请稍候！', + removeMask: true + }); + exportMask.show(); + setTimeout(function () { + exportReportExcel(data); + }, 1000); + } } }], html: '' Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp =================================================================== diff -u -r35437 -r35469 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp (.../foreignTousseApplicationView.jsp) (revision 35437) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp (.../foreignTousseApplicationView.jsp) (revision 35469) @@ -146,6 +146,13 @@ var profile = '${profile}'; <%@ include file="/disinfectsystem/print/print.jsp"%> + + + + + + + @@ -197,12 +204,6 @@ - - - - - - 外来器械包申请单 Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js =================================================================== diff -u -r35414 -r35469 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js (.../qualityMonitoringView.js) (revision 35414) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js (.../qualityMonitoringView.js) (revision 35469) @@ -633,6 +633,7 @@ url: url, async: false, params: params, + timeout: 300*000, success: function (response) { var result = Ext.decode(response.responseText); var title = formName + '（' + startDate + '至' + endDate + '）'; Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.jsp =================================================================== diff -u -r35414 -r35469 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.jsp (.../qualityMonitoringView.jsp) (revision 35414) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.jsp (.../qualityMonitoringView.jsp) (revision 35469) @@ -9,6 +9,13 @@ <%@ include file="/common/includeExtJsAndCss.jsp"%> + + + + + + + @@ -17,12 +24,6 @@ - - - - - - <% SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager"); @@ -92,7 +93,6 @@ - - - - - + + + + + + Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.jsp =================================================================== diff -u -r35414 -r35469 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.jsp (.../tousseWorkLoadView.jsp) (revision 35414) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.jsp (.../tousseWorkLoadView.jsp) (revision 35469) @@ -6,6 +6,13 @@ <%@ include file="/common/includeExtJsAndCss.jsp"%> + + + + + + + @@ -17,12 +24,6 @@ - - - - - -