Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js =================================================================== diff -u -r13970 -r13973 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js (.../qualitymonitoringForm.js) (revision 13970) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js (.../qualitymonitoringForm.js) (revision 13973) @@ -970,10 +970,14 @@ var material = top.Ext.getCmp('material').getValue(); var tousseName = top.Ext.getCmp('tousseName').getRawValue(); var barcode = top.Ext.getCmp('barcode').getValue(); - if(!material && !tousseName){ - showResult("请录入抽验器械或器械包名称"); - thiz.enable(); - return false; + var inspectName = top.Ext.getCmp('inspectItem').getValue(); + if(inspectName != '无'){ + // 质量检测项为'无',不强制登记器械包信息 + if(!material && !tousseName){ + showResult("请录入抽验器械或器械包名称"); + thiz.enable(); + return false; + } } if(material){