Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js =================================================================== diff -u -r31800 -r34308 --- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js (.../printConfig.js) (revision 31800) +++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js (.../printConfig.js) (revision 34308) @@ -1808,6 +1808,47 @@ //标题 LODOP.ADD_PRINT_HTM(30,20,"95%",30,headHtml); } + +/** + * 打印清洗机运行参数 + */ + var printPhaseWashDataConfig = { + customPrint:printPhaseWashDataContent +} + +function printPhaseWashDataContent(obj){ + doGetLodop(); + // 设置纸张类型为连续纸，纸张宽度为79mm，打印完毕后的下边距为20mm + LODOP.SET_PRINT_PAGESIZE(3,"79mm","20mm","CreateCustomPage"); + var html = ''; + html += '

清洗机：'+(obj.rinser || "")+'

'; + html += '

程序编号：'+(obj.programNo || "")+'

'; + html += '

周期名称：'+(obj.cycleName || "")+'

'; + html += '

周期数：'+(obj.cycleCounter || "")+'

'; + html += '

周期开始时间：'+(obj.cycleStartTime || "")+'

'; + html += '

周期时间：'+(obj.cycleTotalTime || "")+'

'; + html += '

消毒时间：'+(obj.disinfectTotalTime || "")+'

'; + html += '

AO：'+(obj.A0 || "")+'

'; + if(obj.lastPhaseWashData && obj.lastPhaseWashData.length > 0){ + html += ''; + html += ''; + html += ''; + html += ''; + for(var i=0;i'; + html += ''; + html += ''; + html += ''; + html += ''; + } + html += '
时间步骤名称温度DoV1 ml
'+obj.lastPhaseWashData[i].stepPhase+''+obj.lastPhaseWashData[i].temp+''+obj.lastPhaseWashData[i].DosVml+'
'; + } + + LODOP.ADD_PRINT_HTM(10,0,"95%","100%",""+html+""); + LODOP.PREVIEW(); +} + var printConfig = { //发货计划单 invoicePlan : invoicePlanPrintConfig, @@ -1874,6 +1915,8 @@ appropriationInList : appropriationInListConfig, //调拨出库单 appropriationOutList : appropriationOutListConfig, + //打印清洗机运行参数 + printPhaseWashData:printPhaseWashDataConfig, //满意度调查表 printSatisfactionSurveyData :printSatisfactionSurveyConfig }; Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp =================================================================== diff -u -r33643 -r34308 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp (.../washDataLineChart.jsp) (revision 33643) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp (.../washDataLineChart.jsp) (revision 34308) @@ -12,7 +12,10 @@ - + + + + -



+ + + + + + + Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js =================================================================== diff -u -r33648 -r34308 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 33648) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 34308) @@ -129,6 +129,8 @@ } else { openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); } + } else if (data.deviceBrand == 'Belimed') { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id + '&deviceBrand=Belimed', '', '清洗参数', '800', '600'); } else { if (sstsConfig.belimedLineChartType == 1) { // ZJJSRM-15倍力曼清洗机接口
+

+
+
+
+