Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
===================================================================
diff -u -r34653 -r34654
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js	(.../diposableGoodsView.js)	(revision 34653)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js	(.../diposableGoodsView.js)	(revision 34654)
@@ -1683,37 +1683,43 @@
 			top.Ext.getCmp("orginalApplicationSpecification").setValue(disposableGoods.applicationSpecification);
 			top.Ext.getCmp("orginalTransferScale").setValue(disposableGoods.transferScale);
 			top.Ext.getCmp("orginalMiddlePackageUnit").setValue(disposableGoods.middlePackageUnit);
-			if(disposableGoods.isConsumptiveMaterial && disposableGoods.isConsumptiveMaterial == '是'){
-				top.Ext.getCmp("isConsumptiveMaterial").setValue('是');
-				top.Ext.getCmp("consumptiveMaterialUse").setValue(disposableGoods.consumptiveMaterialUse);
-				if(disposableGoods.consumptiveMaterialUse == '灭菌耗材'){
-					top.Ext.getCmp('consumptiveMaterialTypeBox').hide();
-					top.Ext.getCmp('consumptiveMaterialVolumeBox').hide();
-					top.Ext.getCmp('volumeUnitBox').hide();
+			if(sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction || sstsConfig.enableSterilizerConsumptiveMaterialConsumptionFunction){
+				if(disposableGoods.isConsumptiveMaterial && disposableGoods.isConsumptiveMaterial == '是'){
+					top.Ext.getCmp("isConsumptiveMaterial").setValue('是');
+					top.Ext.getCmp("consumptiveMaterialUse").setValue(disposableGoods.consumptiveMaterialUse);
+					if(disposableGoods.consumptiveMaterialUse == '灭菌耗材'){
+						top.Ext.getCmp('consumptiveMaterialTypeBox').hide();
+						top.Ext.getCmp('consumptiveMaterialVolumeBox').hide();
+						top.Ext.getCmp('volumeUnitBox').hide();
+					}else {
+						top.Ext.getCmp('consumptiveMaterialTypeBox').show();
+						top.Ext.getCmp('consumptiveMaterialVolumeBox').show();
+						top.Ext.getCmp('volumeUnitBox').show();
+					}
+					top.Ext.getCmp("consumptiveMaterialUseBox").show();
+					if(disposableGoods.consumptiveMaterialType){
+						var id = disposableGoods.consumptiveMaterialType.id;
+						var name = disposableGoods.consumptiveMaterialType.name;
+						var unit = disposableGoods.consumptiveMaterialType.unit;
+						top.Ext.getCmp("consumptiveMaterialTypeId").setValue(id);
+						top.Ext.getCmp("consumptiveMaterialType").setValue(name);
+						top.Ext.getCmp("volumeUnit").setValue(unit);
+					}
 				}else {
-					top.Ext.getCmp('consumptiveMaterialTypeBox').show();
-					top.Ext.getCmp('consumptiveMaterialVolumeBox').show();
-					top.Ext.getCmp('volumeUnitBox').show();
+					if(top.Ext.getCmp('isConsumptiveMaterial')){
+						top.Ext.getCmp("isConsumptiveMaterial").setValue('否');
+					}
+					top.Ext.getCmp("consumptiveMaterialUseBox").hide();
+					top.Ext.getCmp("consumptiveMaterialTypeBox").hide();
+					top.Ext.getCmp("consumptiveMaterialVolumeBox").hide();
+					top.Ext.getCmp("volumeUnitBox").hide();
 				}
-				top.Ext.getCmp("consumptiveMaterialUseBox").show();
-				if(disposableGoods.consumptiveMaterialType){
-					var id = disposableGoods.consumptiveMaterialType.id;
-					var name = disposableGoods.consumptiveMaterialType.name;
-					var unit = disposableGoods.consumptiveMaterialType.unit;
-					top.Ext.getCmp("consumptiveMaterialTypeId").setValue(id);
-					top.Ext.getCmp("consumptiveMaterialType").setValue(name);
-					top.Ext.getCmp("volumeUnit").setValue(unit);
-				}
 			}else {
-				if(top.Ext.getCmp('isConsumptiveMaterial')){
-					top.Ext.getCmp("isConsumptiveMaterial").setValue('否');
-				}
 				top.Ext.getCmp("consumptiveMaterialUseBox").hide();
 				top.Ext.getCmp("consumptiveMaterialTypeBox").hide();
 				top.Ext.getCmp("consumptiveMaterialVolumeBox").hide();
 				top.Ext.getCmp("volumeUnitBox").hide();
 			}
-
 		},
 		failure : function(form, action) {
 		}