Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r24643 -r25555 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 24643) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 25555) @@ -1918,16 +1918,27 @@ mask = new Ext.LoadMask(Ext.getBody(), { msg: '正在处理批量打印请求,请稍候...'}); mask.show(); } + //如需打印看效果需要 设一下 repeat = true; printParams.printScope.reprintTodayPrintedTousseItem = repeat; RecyclingApplicationTableManager.findPrintRecyclingGoods(JSON.stringify(printParams) , function(result){ var obj = JSON.parse(result); - if (!isIE6OrIE7){ - objMask.printMask.hide(); - } - else { - mask.hide(); - } - + if(printConfig.commonEquipmentDeliveryPlanList){ + commonEquipmentDeliveryPlanList(obj); + if (!isIE6OrIE7){ + createMask.call(objMask,'printMask','正在处理批量打印请求,请稍候...',Ext.getBody(),true); + objMask.printMask.show(); + }else{ + mask = new Ext.LoadMask(Ext.getBody(), { msg: '正在处理批量打印请求,请稍候...'}); + mask.show(); + } + return ; + } + if (!isIE6OrIE7){ + objMask.printMask.hide(); + } + else { + mask.hide(); + } if (obj.success){ if (sstsConfig.isShowNoPrintList && obj.noPrintList){ showResult("如下科室未填写申请单:【" + obj.noPrintList + "】","",-1); @@ -3153,7 +3164,7 @@ var operationTbar = createOperationTbar(isFirstSupplyRoomUser); var tbar = [{ - text : '申请物品', + text : '申请物品1', id : 'applyCombo', iconCls : 'btn_ext_add_tousse', tooltip : '申请物品', @@ -3163,7 +3174,7 @@ openApplication(comboApplicationForm,'',''); } },{ - text : sstsConfig.packageName || '申请器械包', + text : sstsConfig.packageName || '申请器械包2', id : 'applyTousse', iconCls : 'btn_ext_add_tousse', tooltip : sstsConfig.packageName || '申请器械包',