Index: ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialSterilizationPurpose/form.js =================================================================== diff -u -r34667 -r34673 --- ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialSterilizationPurpose/form.js (.../form.js) (revision 34667) +++ ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialSterilizationPurpose/form.js (.../form.js) (revision 34673) @@ -69,8 +69,8 @@ autoScroll: false, store: disposableGoodStore, hideHeaders: true, - width: 328, - height: 96, + width: 348, + height: 90, style: 'left: 75px;top: -3px;', viewConfig: { forceFit: true @@ -111,7 +111,7 @@ labelWidth: 70 }, items: [{ - height: 150, + height: 170, width: '100%', layout: 'column', bodyStyle: { background: '#EBF5EC', border: 0 }, @@ -174,7 +174,7 @@ layout: 'fit', title: '关联耗材', width: 500, - height: 230, + height: 250, resizable: false, modal: true, border: false, Index: ssts-web/src/main/webapp/homepage/menu.jsp =================================================================== diff -u -r34649 -r34673 --- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 34649) +++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 34673) @@ -1334,14 +1334,18 @@ */ var SSTS_ConsumptiveMaterialSterilizationPurpose = true; - SSTS_ConsumptiveMaterialSterilizationPurpose = false; + if (!notInWhiteList(sstsConfig, 'enableSterilizerConsumptiveMaterialConsumptionFunction')) { + SSTS_ConsumptiveMaterialSterilizationPurpose = false; + } /** * 《灭菌耗材消耗记录》菜单 */ var SSTS_ConsumptiveMaterialSterilizationSupplies = true; - SSTS_ConsumptiveMaterialSterilizationSupplies = false; + if (!notInWhiteList(sstsConfig, 'enableSterilizerConsumptiveMaterialConsumptionFunction')) { + SSTS_ConsumptiveMaterialSterilizationSupplies = false; + } /** Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp =================================================================== diff -u -r34649 -r34673 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp (.../diposableGoodsView.jsp) (revision 34649) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp (.../diposableGoodsView.jsp) (revision 34673) @@ -38,6 +38,7 @@ +