Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js =================================================================== diff -u -r34692 -r34697 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 34692) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 34697) @@ -741,11 +741,22 @@ listeners:{ select : function(combo , record , index){ if(record.data.value == '是'){ - top.Ext.getCmp('consumptiveMaterialUseBox').show(); - top.Ext.getCmp('consumptiveMaterialTypeBox').show(); - top.Ext.getCmp('consumptiveMaterialVolumeBox').show(); - top.Ext.getCmp('volumeUnitBox').show(); - top.Ext.getCmp('consumptiveMaterialUse').setValue('清洗耗材'); + if(sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction && sstsConfig.enableSterilizerConsumptiveMaterialConsumptionFunction){ + top.Ext.getCmp('consumptiveMaterialUse').setValue('清洗耗材'); + top.Ext.getCmp('consumptiveMaterialUseBox').show(); + top.Ext.getCmp('consumptiveMaterialTypeBox').show(); + top.Ext.getCmp('consumptiveMaterialVolumeBox').show(); + top.Ext.getCmp('volumeUnitBox').show(); + }else if(sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction){ + top.Ext.getCmp('consumptiveMaterialUse').setValue('清洗耗材'); + top.Ext.getCmp('consumptiveMaterialUseBox').show(); + top.Ext.getCmp('consumptiveMaterialTypeBox').show(); + top.Ext.getCmp('consumptiveMaterialVolumeBox').show(); + top.Ext.getCmp('volumeUnitBox').show(); + }else if(sstsConfig.enableSterilizerConsumptiveMaterialConsumptionFunction){ + top.Ext.getCmp('consumptiveMaterialUse').setValue('灭菌耗材'); + top.Ext.getCmp('consumptiveMaterialUseBox').show(); + } }else { top.Ext.getCmp('consumptiveMaterialUseBox').hide(); top.Ext.getCmp('consumptiveMaterialTypeBox').hide(); @@ -1129,6 +1140,11 @@ } if(id != 0){ godownEntryItemStore.load(); + }else { + top.Ext.getCmp("consumptiveMaterialUseBox").hide(); + top.Ext.getCmp("consumptiveMaterialTypeBox").hide(); + top.Ext.getCmp("consumptiveMaterialVolumeBox").hide(); + top.Ext.getCmp("volumeUnitBox").hide(); } }