Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r32982 -r33066 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 32982) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 33066) @@ -3437,6 +3437,13 @@ // 验证参数 function validateFormParamsForPack(){ + if(sstsConfig.showInspectorField){ + var inspector = Ext4.getCmp('inspector' , null , sstsConfig.messagePauseTimeOnPackingPage); + if(inspector.isVisible(true) && !inspector.getValue()){ + showResult("请扫描"+inspectorName+"条码!" , null , sstsConfig.messagePauseTimeOnPackingPage); + return false; + } + } if(!Ext4.getCmp('operator').getValue()){ showResult("请扫描装配人条码!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; @@ -3446,6 +3453,20 @@ showResult("请扫描"+reviewViewText+"人条码!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } + if(sstsConfig.showSterileField){ + var sterileUser = Ext4.getCmp('sterileUser' , null , sstsConfig.messagePauseTimeOnPackingPage); + if(sterileUser.isVisible(true) && !sterileUser.getValue()){ + showResult("请扫描灭菌人条码!" , null , sstsConfig.messagePauseTimeOnPackingPage); + return false; + } + } + if(sstsConfig.showWrapperField){ + var wrapper = Ext4.getCmp('wrapper' , null , sstsConfig.messagePauseTimeOnPackingPage); + if(wrapper.isVisible(true) && !wrapper.getValue()){ + showResult("请扫描包装人条码!" , null , sstsConfig.messagePauseTimeOnPackingPage); + return false; + } + } if(!Ext4.getCmp('sterilingType').getValue() && !Ext4.getCmp('sterilingType').isHidden()){ showResult("请选择灭菌程序!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false;