Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r30493 -r30494 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 30493) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 30494) @@ -4481,7 +4481,7 @@ taskType:'', supplierName:'', haveIDCard:haveIDCard, - urgentAmount:urgentAmount, + urgentAmount:0, childUrgentAmount:urgentAmount, idCardBarcode:taskVO.idCardBarcode, allowModifyPackageType:taskVO.allowModifyPackageType, @@ -4501,14 +4501,15 @@ parentNode = addTaskNode(params); newParentNode = true; }else{ + /* var uamountStr = parentNode.get('urgentAmount'); if(isNumeric(urgentAmount)){ if(isNumeric(uamountStr)){ parentNode.set('urgentAmount',parseInt(uamountStr) + parseInt(urgentAmount)); }else{ parentNode.set('urgentAmount',urgentAmount); } - } + }*/ var errorRemark = parentNode.get('errorRemark'); var damageRemark = parentNode.get('damageRemark'); errorRemark = errorRemark ? errorRemark + ";" + taskVO.errorRemark:taskVO.errorRemark; @@ -4528,7 +4529,7 @@ var invoicePlanId = task.invoicePlanId; var tousseName = task.tousseName; var amount = task.amount; - var childUrgentAmount = task.urgentAmount; + var urgentAmount = task.urgentAmount; var washTime = task.washTime; var basketBarcode = task.basketBarcode; var basketName = task.basketName; @@ -4577,7 +4578,9 @@ var childNode = addTaskNode(task); parentNode.appendChild(childNode); var pNewAmount = parentNode.get('amount') + amount; + var purgentAmount = parseInt(parentNode.get('urgentAmount')) + parseInt(urgentAmount); parentNode.set('amount',pNewAmount); + parentNode.set('urgentAmount',purgentAmount); parentNode.set('unPackingAmount',pNewAmount); } } @@ -5559,6 +5562,7 @@ supplierName:'', haveIDCard:haveIDCard, childUrgentAmount:urgentAmount, + urgentAmount:urgentAmount, idCardBarcode:taskVO.idCardBarcode, allowModifyPackageType:taskVO.allowModifyPackageType, errorRemark:taskVO.errorRemark,