Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r21088 -r21177
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 21088)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 21177)
@@ -2434,20 +2434,25 @@
 //        				showResult('定时签收发货单时间(分钟)不能为空！');
 //        				return false;
 //        			}
-            		var warningTousseWhetherDelivery = Ext.getCmp("warningTousseWhetherDelivery").getValue();
-            		if(warningTousseWhetherDelivery == ""){
-        				showResult('处于预警期器械包能否发货不能为空！');
-        				return false;
-        			}
+            		
+	        		var warningTousseWhetherDelivery = Ext.getCmp("warningTousseWhetherDelivery").getValue();
+	        		if(warningTousseWhetherDelivery == ""){
+	    				showResult('处于预警期器械包能否发货不能为空！');
+	    				return false;
+	    			}
+            		
             		var mergeTousseRuleForInvoiceBatchPrintStr = Ext.getCmp("mergeTousseRuleForInvoiceBatchPrintStr").getRawValue();
             		if(mergeTousseRuleForInvoiceBatchPrintStr == ""){
         				showResult('合并发货单器械规则不能为空！');
         				return false;
         			}
-            		var supplierCertificationExpTime = Ext.getCmp("supplierCertificationExpTime").getValue();
-            		if(supplierCertificationExpTime == ""){
-            			showResult('供应商注册证预警不能为空！');
-            			return false;
+            		
+            		if(sstsConfig.enableExpensiveGoods){
+	            		var supplierCertificationExpTime = Ext.getCmp("supplierCertificationExpTime").getValue();
+	            		if(supplierCertificationExpTime == ""){
+	            			showResult('供应商注册证预警不能为空！');
+	            			return false;
+	            		}
             		}
             		var unitName = Ext.getCmp("unitName").getValue();
             		var basketLoadeTousseAmount = Ext.getCmp("basketLoadeTousseAmount").getValue();