Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r14660 -r14932
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 14660)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 14932)
@@ -1947,22 +1947,57 @@
 		        		}
 		        	});
 		        	}
-		        },
-		        {text: '打印器械包及消毒物品', handler: function(){
+		        },{
+		        	text: '打印器械包',
+		        	hidden:!sstsConfig.splitTousseAndDisinfectInvoiceBtn,
+		        	handler:function(){
+			        	checkPrintStatus(function(){
+			        		var ids = getSelectedIds();
+			        		if (ids != null && ids != false){
+			        			top.Ext.MessageBox.confirm("请确认", "要打印所选的发货单的器械包吗？",
+				        				function(btn) {
+				        					if (btn == 'yes') {
+				        						batchPrintInvoiceWithType(ids,'器械包');
+				        					}
+				        				});
+			        		}
+			        	});
+			        	}
+			        
+		        },{
+		        	text: '打印消毒物品', 
+		        	hidden:!sstsConfig.splitTousseAndDisinfectInvoiceBtn,
+		        	handler:function(){
+			        	checkPrintStatus(function(){
+			        		var ids = getSelectedIds();
+			        		if (ids != null && ids != false){
+			        			top.Ext.MessageBox.confirm("请确认", "要打印所选的发货单的消毒物品吗？",
+				        				function(btn) {
+				        					if (btn == 'yes') {
+				        						batchPrintInvoiceWithType(ids,'消毒物品');
+				        					}
+				        				});
+			        		}
+			        	});
+			        	}
+			        
+		        },{
+		        	text: '打印器械包及消毒物品', 
+		        	hidden:sstsConfig.splitTousseAndDisinfectInvoiceBtn,
+		        	handler: function(){
 		        	checkPrintStatus(function(){
 		        		var ids = getSelectedIds();
 		        		if (ids != null && ids != false){
 		        			top.Ext.MessageBox.confirm("请确认", "要打印所选发货单的器械包及消毒物品吗？",
 		        				function(btn) {
 		        					if (btn == 'yes') {
-		        						batchPrintInvoiceWithType(ids,'器械包');
+		        						batchPrintInvoiceWithType(ids,'器械包及消毒物品');
 		        					}
 		        				});
 		        		}
 		        	});
-	        	} 
-	        },
-		        {text: '打印全部物品', handler: function(){
+	        		} 
+		        },{text: '打印全部物品', handler: function(){
 		        	checkPrintStatus(function(){
     					var ids = getSelectedIds();
     	        		if (ids != null && ids != false){