Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r31728 -r31928 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 31728) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 31928) @@ -3455,6 +3455,10 @@ var result = JSON.parse(jsonStr); if (result.success) { var tousses = result.tousseDefinitions; + var currentDateTime = result.currentDateTime || ''; + if(currentDateTime !== ''){ + currentDateTime = currentDateTime.split(' ')[0]; + } if (tousses != null && tousses.length > 0) { top.Ext.Msg.show({ title: '输入打印份数', @@ -3471,6 +3475,7 @@ for (var j = 0; j < Number(txt); j++) { for (var i = 0; i < tousses.length; i++) { var toussedef = tousses[i]; + toussedef.currentDateTime = currentDateTime; ++curNumber; Ext.MessageBox.updateProgress((curNumber) / count, '第' + (curNumber) + '个,共' + count + '个'); printTousseDefinitionMaterialsInTousseView(toussedef, 1); Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r31885 -r31928 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 31885) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 31928) @@ -3135,16 +3135,23 @@ } var tableHtml = ret.tableHtml + ""; tableHtml += ""; - tableHtml += ""; + if(tousseDefinitionObj.currentDateTime && tousseDefinitionObj.currentDateTime !== ''){ + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + }else { + tableHtml += ""; + } tableHtml += ""; //告警语(已注释不打印,经省医护长与封枫、关总确认 since 2016-01-25 SYF) tableHtml += ""; tableHtml += ""; tableHtml += ""; tableHtml += "
器械总数量:"+ret.amount+"件"; - tableHtml += "器械总数量: "+ret.amount+"件"; + tableHtml += "打印日期: "+tousseDefinitionObj.currentDateTime; + tableHtml += "器械总数量: "+ret.amount+"件"; + tableHtml += "
***需要回收，切勿丢失***
"; - LODOP.ADD_PRINT_HTM(0,0,"95%","100%",""+tableHtml+""); } /** @@ -3257,11 +3264,10 @@ tableHtml += ""; tableHtml += ""; - tableHtml += ""; tableHtml += ""; - //告警语(已注释不打印,经省医护长与封枫、关总确认 since 2016-01-25 SYF) /*tableHtml += ""; tableHtml += ""; Index: ssts-web/src/main/webapp/disinfectsystem/config/hbsxkyy/print/printConfig.js =================================================================== diff -u -r29305 -r31928 --- ssts-web/src/main/webapp/disinfectsystem/config/hbsxkyy/print/printConfig.js (.../printConfig.js) (revision 29305) +++ ssts-web/src/main/webapp/disinfectsystem/config/hbsxkyy/print/printConfig.js (.../printConfig.js) (revision 31928) @@ -1242,7 +1242,10 @@ tableHtml += ""; tableHtml += "
"+barcode; tableHtml += ""; - tableHtml += ""; tableHtml += "";
器械总数量:"+amount+"件"; + tableHtml += "器械总数量:"+amount+"件"; tableHtml += "
***需要回收，切勿丢失***
器械总数量:"+ret.amount+"件"; + tableHtml += "器械总数量:"+ret.amount+"件"; + if(tousseDefinitionObj.currentDateTime && tousseDefinitionObj.currentDateTime !== ''){ + tableHtml += "
打印日期："+tousseDefinitionObj.currentDateTime+""; + } tableHtml += "