Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.jsp =================================================================== diff -u -r35940 -r35946 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.jsp (.../tousseWorkLoadView.jsp) (revision 35940) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.jsp (.../tousseWorkLoadView.jsp) (revision 35946) @@ -27,8 +27,6 @@ - - -<%-- - --%> + + 器械包工作量统计报表 - - - - - - - - - - - - - - - -
NameAgeEmail
EmailEmailEmail
- - - -
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js =================================================================== diff -u -r35940 -r35946 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js (.../tousseWorkLoadView.js) (revision 35940) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js (.../tousseWorkLoadView.js) (revision 35946) @@ -164,41 +164,6 @@ html += ''; return html; } -function exportTableData() { - //const table = document.getElementById('table'); // 获取要导出的表格元素 - const table = document.getElementById('thisIframe').contentWindow.document.getElementById('table') - const tableData = []; // 用于存储表格数据的数组 - - /* for (let i = 0; i < table.rows.length; i++) { // 遍历表格行并提取单元格数据 - const row = table.rows[i]; - const rowData = []; - - for (let j = 0; j < row.cells.length; j++) { // 遍历单元格并提取单元格数据 - const cell = row.cells[j]; - rowData.push(cell.textContent); - } - - tableData.push(rowData); // 将行数据添加到数组中 - } - */ - table.find('tr').each(function() { // 遍历表格中的每一行 - var cells = $(this).find('td'); // 获取当前行中的所有单元格 - var rowData = []; // 用于存储当前行数据的数组 - cells.each(function() { // 遍历每个单元格 - rowData.push($(this).text()); // 将单元格中的文本添加到当前行数据中 - }); - rows.push(rowData); // 将当前行数据添加到数组中 - }); - const fileBlob = new Blob([tableData], {type: 'application/vnd.ms-excel'}); // 将数组转换为二进制Blob对象 - const url = URL.createObjectURL(fileBlob); // 创建一个临时的URL对象,用于下载文件 - - const link = document.createElement('a'); - link.href = url; - link.download = 'table.xlsx'; // 设置文件名 - link.click(); // 模拟点击链接进行下载 - - URL.revokeObjectURL(url); // 释放URL对象占用的资源 -} //获取表头列 function getTableHeaderColumnArray(parametMap, statType) { var materialColumnName = "件数"; @@ -1073,15 +1038,14 @@ tbar: [{ text: '导出', handler: function () { - exportTableData(); - /*var html = document.getElementById('thisIframe').contentWindow.document.getElementById('table').innerHTML; + var html = document.getElementById('thisIframe').contentWindow.document.getElementById('table').innerHTML; if (html !== '') { var startTime = $Id('startTime').value; var endTime = $Id('endTime').value; var title = '器械包工作量统计报表(' + startTime + ' ~ ' + endTime + ')'; var data = { fileName: title, - fileType: ".xlsx",//文档类型 经测试 可以doc xls html 其他的自己去试 + fileType: ".xls",//文档类型 经测试 可以doc xls html 其他的自己去试 html: html } exportMask = new Ext.LoadMask(Ext.getBody(), { @@ -1092,7 +1056,7 @@ setTimeout(function () { exportReportExcel(data); }, 1000); - }*/ + } } }], html: '' Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/config.js =================================================================== diff -u -r35940 -r35946 --- ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/config.js (.../config.js) (revision 35940) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/config.js (.../config.js) (revision 35946) @@ -1,11 +1,10 @@ -var sstsConfig = { +var sstsConfig = { hiddenOrgunitSyncButton:true, hiddenUserSyncButton:true, // 回收时科室显示结算科室 showSettleAccountsDepartInRecycling : false, // 审核器械包必须入篮筐(一级供应室) mustScanBasketForTousseReview : true, - enableCSSDWorkloadReportForTangshanWorkersHospital:true, // 审核器械包必须入篮筐(二级供应室) mustScanBasketForTousseReviewOf2ndSupplyRoom : false, // 申请表单的类型:1 : 通用申请单(组合申请单),2:分开的申请单 @@ -237,20 +236,10 @@ onlySelectExistedForeignTousse:true, //启用灭菌监测包功能 enableScanSterilizationMonitoringPackage:true, - extendedColumnConfigOfDetailedAccountingMonthlyReport:["tousseGroupName"], - //showMaterialsAmountColumnOfDetailMonthReport:true, - showSupplierNameInDetailedAccountingMonthlyReport:true, //灭菌炉接口是否采用开始时间匹配数据 sterilizaMatchPatternForDate:true, - enableInstrumentRepairRecordReports:true, //是否启用灭菌结果判定功能 enableTheSterilizationResultJudgmentFunction:true, //辅助发货的物品类型 - auxiliaryInvoiceTousseTypes:"敷料包,普通器械包,外来器械包,外部带来灭菌包,消毒物品", - reportExportExtraFormats:0, - enableMultipleBranchesOfHospital:true, - enableDiscountPrice:true, - isYearWorkloadReportSpecial:true, - enableWheterToChargeFieldOfDisposableGoods:true, - enableCountTheNumberOfEmptyFurnaceSterilizationsFunction:true + auxiliaryInvoiceTousseTypes:"敷料包,普通器械包,外来器械包,外部带来灭菌包,消毒物品" } \ No newline at end of file