Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r29611 -r29615 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 29611) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 29615) @@ -823,6 +823,7 @@ {name : 'serialNumber'}, {name : 'cleaned'}, {name : 'note'}, + {name : 'maxAmount'}, {name : 'urgentLevelObj'}, {name : 'colorCode'} ]}); @@ -1490,8 +1491,11 @@ if(amount < cNode.get('amount')){ cNode.set('amount',cNode.get('amount') - amount); }else{ - var len = delNodes.length; - delNodes[len] = cNode; + if(cNode.get('maxAmount') == cNode.get('amount')){ + cNode.remove(); + }else { + cNode.set('amount',cNode.get('maxAmount') - amount); + } } } } @@ -4224,7 +4228,6 @@ } var taskList = jsonObj.data; var nLength = taskList?taskList.length:0; - if(scanType == 1){ if(jsonObj.notWashedInfo !== ''){ showResult(jsonObj.notWashedInfo); @@ -4236,7 +4239,6 @@ } var speakBasket = new SpeakBasket(); - for(var n = 0;n < nLength; n++){ var taskVO = taskList[n]; var td_id = taskVO.tousseID; @@ -4309,7 +4311,8 @@ urgentLevelObj:taskVO.urgentLevelObj, colorCode:taskVO.colorCode, errorDamageRemarkId:'', - errorDamageRemarkInfo:'' + errorDamageRemarkInfo:'', + maxAmount:0 } parentNode = addTaskNode(params); newParentNode = true; @@ -4357,6 +4360,7 @@ var taskType = task.taskType; var supplierName = task.supplierName; var packageSize = task.packageSize; + var maxAmount = task.maxAmount; if(task.tousseType == '外来器械包'){ haveForeignTousseNode = true; } @@ -4385,6 +4389,7 @@ task.tousseType1 = tousseType; task.packageType = packageType; task.sterilingMethod = sterilingMethod; + task.maxAmount = maxAmount; var childNode = addTaskNode(task); parentNode.appendChild(childNode); var pNewAmount = parentNode.get('amount') + amount;