Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r36458 -r36462 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 36458) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 36462) @@ -4057,7 +4057,7 @@ // 验证参数 function validateFormParamsForPack() { - if (showInspectorField) { + if (showInspectorField && !inspectorFieldAllowBlank) { var inspector = Ext4.getCmp('inspector', null, sstsConfig.messagePauseTimeOnPackingPage); if (inspector.isVisible(true) && !inspector.getValue()) { showMultipleResult("请扫描" + inspectorName + "条码!", null, sstsConfig.messagePauseTimeOnPackingPage); @@ -4068,19 +4068,21 @@ showMultipleResult("请扫描配包人条码!", null, sstsConfig.messagePauseTimeOnPackingPage); return false; } - var reviewer = Ext4.getCmp('reviewer', null, sstsConfig.messagePauseTimeOnPackingPage); - if (reviewer.isVisible(true) && !reviewer.getValue()) { - showMultipleResult("请扫描" + reviewViewText + "人条码!", null, sstsConfig.messagePauseTimeOnPackingPage); - return false; + if(showReviewerField && !reviewerFieldAllowBlank){ + var reviewer = Ext4.getCmp('reviewer', null, sstsConfig.messagePauseTimeOnPackingPage); + if (reviewer.isVisible(true) && !reviewer.getValue()) { + showMultipleResult("请扫描" + reviewViewText + "人条码!", null, sstsConfig.messagePauseTimeOnPackingPage); + return false; + } } - if (showSterileField) { + if (showSterileField && !sterileFieldAllowBlank) { var sterileUser = Ext4.getCmp('sterileUser', null, sstsConfig.messagePauseTimeOnPackingPage); if (sterileUser.isVisible(true) && !sterileUser.getValue()) { showMultipleResult("请扫描灭菌人条码!", null, sstsConfig.messagePauseTimeOnPackingPage); return false; } } - if (showWrapperField) { + if (showWrapperField && !wrapperFieldAllowBlank) { var wrapper = Ext4.getCmp('wrapper', null, sstsConfig.messagePauseTimeOnPackingPage); if (wrapper.isVisible(true) && !wrapper.getValue()) { showMultipleResult("请扫描包装人条码!", null, sstsConfig.messagePauseTimeOnPackingPage);