Index: ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js
===================================================================
diff -u -r13041 -r13058
--- ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js	(.../config.js)	(revision 13041)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js	(.../config.js)	(revision 13058)
@@ -47,5 +47,9 @@
   showExternalCodeOfDisposableGoods : true,
   autoFillExternalCodeOfDisposableGoods: true, // 自动填写一次性物品的外部编码
   //是否打印消毒物品失效时期
-  printValidDateUtil:true
+  printValidDateUtil:true,
+  //入库单是否显示发票
+  godownEntryShowInvoice:true,
+  //入库单是否显示生物检测信息
+  godownEntryShowBiologicalTestReport:true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
===================================================================
diff -u -r13039 -r13058
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 13039)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 13058)
@@ -207,8 +207,10 @@
 	var hasBiologicalTestReport = top.Ext.getCmp("hasBiologicalTestReport").getValue();
 	var hasInvoice = top.Ext.getCmp("hasInvoice").getValue();
 	if(hasInvoice == null || hasInvoice == ''){
-		showResult("请选择是否有发票");
-		return false;
+		if(sstsConfig.godownEntryShowInvoice){
+			showResult("请选择是否有发票");
+			return false;
+		}
 	}
 	//添加操作
 	
@@ -633,7 +635,7 @@
 	    						combo.setValue(record.data.hasType);
 	    					}
 	    				}
-	        		})},
+	        		}),hidden:!sstsConfig.godownEntryShowBiologicalTestReport},
         		{header : "有无发票",width : 70,menuDisabled : true,dataIndex : 'hasInvoice',
 	        		editor : new top.Ext.form.ComboBox({ 						
 	    				minChars : 0,
@@ -653,7 +655,7 @@
 	    						combo.setValue(record.data.hasType);
 	    					}
 	    				}
-	        		})},
+	        		}),hidden:!sstsConfig.godownEntryShowInvoice},
 	        	{header : "删除",width : 50,menuDisabled : true,dataIndex : 'deleteButton', renderer:renderDeleteButton}
 	        ]),
 			width :1380,
@@ -799,13 +801,19 @@
 				listeners:{
 					specialkey : function(field, ee) {
 						if (ee.getKey() == Ext.EventObject.ENTER) {
-							top.Ext.getCmp('hasBiologicalTestReport').focus();
-							top.Ext.getCmp('hasBiologicalTestReport').selectText();
+							if(sstsConfig.godownEntryShowBiologicalTestReport){
+								top.Ext.getCmp('hasBiologicalTestReport').focus();
+								top.Ext.getCmp('hasBiologicalTestReport').selectText();
+							}else{
+								top.Ext.getCmp('expDate1').focus();
+								top.Ext.getCmp('expDate1').selectText();
+							}
 						}
 					}
 				}
 			},{
-				text:'生物检测:'
+				text:'生物检测:',
+				hidden:!sstsConfig.godownEntryShowBiologicalTestReport
 			},{
 				xtype : 'combo',
 				id : 'hasBiologicalTestReport',
@@ -824,6 +832,7 @@
 				allowBlank : true,
 				width : 80,
 				tabIndex : 5,
+				hidden:!sstsConfig.godownEntryShowBiologicalTestReport,
 				listeners : {
 					select : function(field, r) {
 						top.Ext.getCmp('expDate1').focus();
@@ -917,13 +926,19 @@
 	    					},
 	    					specialKey:function(f,e){
 	    						if (e.getKey() == Ext.EventObject.ENTER) {
-	    							top.Ext.getCmp('invoice1').focus();
-	    							top.Ext.getCmp('invoice1').selectText();
+	    							if(sstsConfig.godownEntryShowInvoice){
+	    								top.Ext.getCmp('invoice1').focus();
+		    							top.Ext.getCmp('invoice1').selectText();
+	    							}else{
+	    								top.Ext.getCmp('manufacturer').focus();
+		    							top.Ext.getCmp('manufacturer').selectText();
+	    							}
 	    						}
 	    					}
 	    				}
 	    			},{
-	    				text:'有无发票:'
+	    				text:'有无发票:',
+	    				hidden:!sstsConfig.godownEntryShowInvoice
 	    			},{
 	    				xtype : 'combo',
 	    				id : 'hasInvoice',
@@ -942,6 +957,7 @@
 	    				allowBlank : true,
 	    				width : 80,
 	    				tabIndex : 9,
+	    				hidden:!sstsConfig.godownEntryShowInvoice,
 	    				listeners : {
 	    					select : function(field, r) {
 	    						top.Ext.getCmp('manufacturer').focus();