Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r25555 -r25564
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 25555)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 25564)
@@ -1922,23 +1922,24 @@
 		printParams.printScope.reprintTodayPrintedTousseItem = repeat;
 	    RecyclingApplicationTableManager.findPrintRecyclingGoods(JSON.stringify(printParams) , function(result){
 	    	var obj = JSON.parse(result);
-				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 ;
-				}
+	    	//如果批量打印发货计划的版本为1时
+			if(sstsConfig.batchPrintInvoicePlanVersion == 1){
+				commonEquipmentDeliveryPlanList(obj);
 				if (!isIE6OrIE7){
-					objMask.printMask.hide();
+					createMask.call(objMask,'printMask','正在处理批量打印请求，请稍候...',Ext.getBody(),true);
+					objMask.printMask.show();
+				}else{
+					mask = new Ext.LoadMask(Ext.getBody(), { msg: '正在处理批量打印请求，请稍候...'});
+					mask.show();
 				}
-				else {
-					mask.hide();
-				}
+				return ;
+			}
+			if (!isIE6OrIE7){
+				objMask.printMask.hide();
+			}
+			else {
+				mask.hide();
+			}
 	    	if (obj.success){
 				if (sstsConfig.isShowNoPrintList && obj.noPrintList){
 					showResult("如下科室未填写申请单：【" + obj.noPrintList + "】","",-1);
@@ -3164,7 +3165,7 @@
     var operationTbar = createOperationTbar(isFirstSupplyRoomUser);
 
 	var tbar = [{
-			text : '申请物品1',
+			text : '申请物品',
 			id : 'applyCombo',
 			iconCls : 'btn_ext_add_tousse',
 			tooltip : '申请物品',
@@ -3174,7 +3175,7 @@
 				openApplication(comboApplicationForm,'','');
 			}
 		},{
-			text : sstsConfig.packageName || '申请器械包2',
+			text : sstsConfig.packageName || '申请器械包',
 			id : 'applyTousse',
 			iconCls : 'btn_ext_add_tousse',
 			tooltip : sstsConfig.packageName || '申请器械包',