Index: ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js =================================================================== diff -u -r28845 -r28846 --- ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js (.../printApplicationGoods.js) (revision 28845) +++ ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js (.../printApplicationGoods.js) (revision 28846) @@ -155,6 +155,29 @@ return Number(v).toFixed(2); } +function isIETrue(){ + var vals = ''; + if(!!window.ActiveXObject || "ActiveXObject" in window){ + if(vals !== ''){ + var DEFAULT_VERSION = 8.0; + var ua = navigator.userAgent.toLowerCase(); + var safariVersion = ua.match(/msie ([\d.]+)/) || ''; + if(safariVersion == ''){ + return false; + } + if(safariVersion[1] <= DEFAULT_VERSION ){ + return true; + }else { + return false; + } + } + + return true; + }else{ + return false; +   } +} + //批量打印申请单 function printApplicationGoods(printType, printSummaryObj) { LODOP = getLodop(document.getElementById('LODOP'), document @@ -169,10 +192,10 @@ } if(printType == 0){//直接打印 LODOP.PRINT(); - }else{//打印预览 - LODOP.SET_SHOW_MODE("HIDE_PAPER_BOARD",1); - LODOP.PREVIEW(); - LODOP.On_Return = function(id,value){ + }else{ + LODOP.SET_SHOW_MODE("HIDE_PAPER_BOARD",1); + if(isIETrue()){ + var value = LODOP.PREVIEW(); if(value == 1){ var tousseItemIds = []; top.Ext4.Array.each(printSummaryObj.pages, function(page){ @@ -193,6 +216,30 @@ }); } } + }else { + LODOP.PREVIEW(); + LODOP.On_Return = function(id,value){ + if(value == 1){ + var tousseItemIds = []; + top.Ext4.Array.each(printSummaryObj.pages, function(page){ + top.Ext4.Array.each(page.rows, function(row){ + tousseItemIds = tousseItemIds.concat(row.tousseItemIds); + // tousseItemIds.push(row.tousseItemId); + }); + }); + if(tousseItemIds.length > 0){ + var tousseItemIdStrs = JSON.stringify(tousseItemIds); + Ext.Ajax.request({ + url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!updateTousseItemPrintStatus.do', + params : {ids : tousseItemIdStrs, setPrintTime : true}, + success : function(response, options) { + //更新完打印状态之后,及时刷新页面 + grid.dwrReload(); + } + }); + } + } + } } } }else{