Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r33065 -r33156 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 33065) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 33156) @@ -2151,25 +2151,23 @@ printParams.printScope.reprintTodayPrintedTousseItem = repeat; RecyclingApplicationTableManager.findPrintRecyclingGoods(JSON.stringify(printParams) , function(result){ var obj = JSON.parse(result); - //如果批量打印发货计划的版本为1时 - if(sstsConfig.batchPrintInvoicePlanVersion == 1){ - commonEquipmentDeliveryPlanList(obj); + if (obj.success){ + //如果批量打印发货计划的版本为1时 + if(sstsConfig.batchPrintInvoicePlanVersion == 1){ + commonEquipmentDeliveryPlanList(obj); + if (!isIE6OrIE7){ + objMask.printMask.hide(); + }else { + mask.hide(); + } + return ; + } if (!isIE6OrIE7){ - createMask.call(objMask,'printMask','正在处理批量打印请求,请稍候...',Ext.getBody(),true); - objMask.printMask.show(); - }else{ - mask = new Ext.LoadMask(Ext.getBody(), { msg: '正在处理批量打印请求,请稍候...'}); - mask.show(); + objMask.printMask.hide(); } - return ; - } - if (!isIE6OrIE7){ - objMask.printMask.hide(); - } - else { - mask.hide(); - } - if (obj.success){ + else { + mask.hide(); + } if (sstsConfig.isShowNoPrintList && obj.noPrintList){ showResult("如下科室未填写申请单:【" + obj.noPrintList + "】","",-1); } @@ -2189,6 +2187,12 @@ } else{ showResult(obj.message); + if (!isIE6OrIE7){ + objMask.printMask.hide(); + } + else { + mask.hide(); + } } }); }