Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r13718 -r13746 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 13718) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 13746) @@ -993,7 +993,36 @@ }); } } - +// 校验材料是否有丢失和报损还未补充 +function validateSupplement(cNode){ + var tousseName = cNode.get("tousseName"); + var status = cNode.get("status"); + var basketBarcode = cNode.get("basketBarcode"); + var taskId = cNode.get("taskId"); + var tousseType = cNode.get("tousseType"); + var damages = cNode.get("damages"); + var errors = cNode.get("errors"); + + if(status == '待确认'){ + showResult(tousseName+",有器械丢失,请确认!"); + return false; + } + var lost = false; + for(var i = 0;i < errors.length ; i++) { + if(errorTypeAdd != errors[i].errorType && ((errors[i].amount - errors[i].additionalAmount) != 0)) { + lost = true; + } + } + if(lost){ + showResult("材料缺失,不够组成器械包,请补充缺失器械!"); + return false; + } + if(damages != null && damages.length > 0){ + showResult("材料已报损,不够组成器械包,请补充报损器械!"); + return false; + } + return true; +} formPanel = new Ext4.Panel({ id : 'formPanel', minHeight: 110, @@ -1885,6 +1914,9 @@ if(!validateFormParamsForPack()){ return; } + if(!(validateSupplement(idCardTaskNode))){ + return; + } // 标识牌的打印 var packed = printTousseByIDcardTaskNode(idCardTaskNode); if(packed){