Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js =================================================================== diff -u -r41423 -r41424 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 41423) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 41424) @@ -562,7 +562,7 @@ for (var i = 0; i < tousseBags.length; i++) { var tousseName = tousseBags[i].tousseName; var materialInfos = tousseBags[i].materialInfos; - if(materialInfos.length == 0){ + if(materialInfos.length == 0 && inspectMaterialRequired == '是'){ isNull = true; break; } @@ -771,7 +771,7 @@ if(scope == '器械包'){ showResultQM('器械包不能为空!'); }else if(scope == '材料'){ - showResultQM('抽检器械不能为空!'); + showResultQM('抽检器械至少需要填写一个!'); }else { showResultQM('器械包或抽检器械不能为空!'); }