Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.js
===================================================================
diff -u -r25533 -r29581
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.js	(.../comboTousse.js)	(revision 25533)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.js	(.../comboTousse.js)	(revision 29581)
@@ -57,46 +57,6 @@
 
 }
 
-function printTousseDefinitionMaterial(ids) {
-    TousseDefinitionTableManager.getTousseDefinition(ids, function (jsonStr) {
-        var result = JSON.parse(jsonStr);
-        if (result.success) {
-            var tousses = result.tousseDefinitions;
-            if (tousses != null && tousses.length > 0) {
-                top.Ext.Msg.show({
-                    title: '输入打印份数',
-                    msg: '打印份数：',
-                    width: 100,
-                    buttons: Ext.MessageBox.OKCANCEL,
-                    prompt: true,
-                    fn: function (bu, txt) {
-                        if (bu == 'ok') {
-                            if (isNaN(txt) == false) {
-                                Ext.MessageBox.progress('打印中', '请稍候...');
-                                var curNumber = 0;
-                                var count = Number(txt) * tousses.length;
-                                for (var j = 0; j < Number(txt); j++) {
-                                    for (var i = 0; i < tousses.length; i++) {
-                                        var toussedef = tousses[i];
-                                        ++curNumber;
-                                        Ext.MessageBox.updateProgress((curNumber) / count, '第' + (curNumber) + '个,共' + count + '个');
-                                        printTousseDefinitionMaterialsInTousseView(toussedef, 0);
-                                    }
-                                }
-                                hideMessageBox(false);
-                            } else {
-                                showResult("打印份数必须是数字，请重新输入!");
-                            }
-                        }
-                    },
-                    animEl: 'addAddressBtn',
-                    value: '1'
-                });
-            }
-        }
-    });
-}
-
 var refresh = function () {
     grid.dwrReload();
     grid.store.reload();
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js
===================================================================
diff -u -r29107 -r29581
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js	(.../customTousseForm.js)	(revision 29107)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js	(.../customTousseForm.js)	(revision 29581)
@@ -500,7 +500,7 @@
 			},{
 				columnWidth : .5,
 				layout : 'form',
-				labelWidth : 70,
+				labelWidth : 90,
 				items : [{
 							xtype : 'combo',
 							fieldLabel : '器械包名称',
@@ -562,7 +562,7 @@
 		         layout : 'form',
 		         items:[{
 		        	    xtype : 'button',
-		    			text : '<font style="width:60px;display: block;">添加器械包</font>',
+		    			text : '<font style="display: block;">添加器械包</font>',
 //		    			iconCls : 'btn_ext_add',
 		    			disabled : !fillTousseName,
 		    			handler : function() {
@@ -572,7 +572,7 @@
 	         },{
 					columnWidth : .5,
 					layout : 'form',
-					labelWidth : 70,
+					labelWidth : 90,
 					items : [{
 		    			xtype : 'combo',
 		    			fieldLabel : '材料名称',
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r29543 -r29581
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 29543)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 29581)
@@ -4657,6 +4657,26 @@
 						handler : function() {
 							recyclingDetailWindow();
 						}
+					},{
+						text : '打印材料清单',
+						hidden:!(sstsConfig.showPrintBOMButton),
+						iconCls : 'icon_print',
+						handler : function() {
+							var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
+							var selNodes = waitPackingTreeGrid.getView().getChecked();
+							if(selNodes.length == 0){
+								showResult('请选择需要打印的包');
+								return;
+							}
+							var ids = [];
+							Ext4.each(selNodes, function(pNode) {
+								Ext4.each(pNode.childNodes, function(cNode){
+									var tousseID = cNode.get('tousseID');
+									ids.push(tousseID);
+								});
+							});
+							printTousseDefinitionMaterial(ids.join(';'));
+						}
 					}
     			]
     		},{
Index: ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/config.js
===================================================================
diff -u -r29359 -r29581
--- ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/config.js	(.../config.js)	(revision 29359)
+++ ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/config.js	(.../config.js)	(revision 29581)
@@ -198,6 +198,7 @@
   //回收时自动加载清洗装载状态的篮筐
   loadWashLoadingStatusBasketsWhenRecycling:true,
   //控制PDA的回收清点模块的功能是预回收还是器械交接，值为1代表预回收
-  prepareRecycleVersion:1
-  
+  prepareRecycleVersion:1,
+  //装配界面显示打印材料清单按钮
+  showPrintBOMButton:true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js
===================================================================
diff -u -r29342 -r29581
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js	(.../tousseView.js)	(revision 29342)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js	(.../tousseView.js)	(revision 29581)
@@ -44,46 +44,6 @@
 
 }
 
-function printTousseDefinitionMaterial(ids){
-	TousseDefinitionTableManager.getTousseDefinition(ids,function(jsonStr){
-		var result = JSON.parse(jsonStr);
-		if(result.success){
-			var tousses = result.tousseDefinitions;
-			if(tousses!=null  && tousses.length > 0){
-				top.Ext.Msg.show({
-				   title: '输入打印份数',
-				   msg: '打印份数：',
-				   width: 100,
-				   buttons: Ext.MessageBox.OKCANCEL,
-				   prompt : true,
-				   fn: function(bu, txt) {
-						if(bu == 'ok'){
-							if(isNaN(txt) == false){
-								Ext.MessageBox.progress('打印中', '请稍候...');
-								var curNumber = 0;
-								var count = Number(txt) * tousses.length;
-								for(var j = 0 ; j< Number(txt) ; j++){
-									for(var i=0;i<tousses.length;i++){
-										var toussedef = tousses[i];
-										++curNumber;
-										Ext.MessageBox.updateProgress((curNumber)/count,'第' + (curNumber) + '个,共' + count +  '个');
-										printTousseDefinitionMaterialsInTousseView(toussedef,1);
-									}
-								}
-								hideMessageBox(false);
-							}else{
-								showResult("打印份数必须是数字，请重新输入!");
-							}
-						}
-					},
-				  animEl: 'addAddressBtn',
-				  value:'1'
-				});
-			}
-		}
-	});
-}
-
 var refresh = function() {
 	grid.dwrReload();
 	grid.store.reload();
@@ -320,7 +280,7 @@
 			handler : function() {
 				var rows = grid.getSelectionModel().getSelections();
 				if(rows.length == 0){
-					 showResult('请选择需要打印的器械包!');
+					 showResult('请选择需要打印的包!');
 					 return;
 				}
 				var ids = [];
Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r29557 -r29581
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 29557)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 29581)
@@ -3422,4 +3422,44 @@
 		result.height = parseInt(span.offsetHeight) - result.height;
     }
 	return result;
+}
+//打印材料清单(包含了装配页面,聚合包页面,器械包定义页面)
+function printTousseDefinitionMaterial(ids){
+	TousseDefinitionTableManager.getTousseDefinition(ids,function(jsonStr){
+        var result = JSON.parse(jsonStr);
+		if(result.success){
+			var tousses = result.tousseDefinitions;
+			if(tousses!=null  && tousses.length > 0){
+				top.Ext.Msg.show({
+				   title: '输入打印份数',
+				   msg: '打印份数：',
+				   width: 100,
+				   buttons: Ext.MessageBox.OKCANCEL,
+				   prompt : true,
+				   fn: function(bu, txt) {
+						if(bu == 'ok'){
+							if(isNaN(txt) == false){
+								Ext.MessageBox.progress('打印中', '请稍候...');
+								var curNumber = 0;
+								var count = Number(txt) * tousses.length;
+								for(var j = 0 ; j< Number(txt) ; j++){
+									for(var i=0;i<tousses.length;i++){
+										var toussedef = tousses[i];
+										++curNumber;
+										Ext.MessageBox.updateProgress((curNumber)/count,'第' + (curNumber) + '个,共' + count +  '个');
+										printTousseDefinitionMaterialsInTousseView(toussedef,1);
+									}
+								}
+								hideMessageBox(false);
+							}else{
+								showResult("打印份数必须是数字，请重新输入!");
+							}
+						}
+					},
+				  animEl: 'addAddressBtn',
+				  value:'1'
+				});
+			}
+		}
+	});
 }
\ No newline at end of file