Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r21626 -r21636 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 21626) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 21636) @@ -1920,7 +1920,7 @@ taskStatus,department,tousseType, packageType, sterilingMethod,recyclingTime,isTraceable,isPrint,isReview,errors, damages,replenishMaterils,taskType,supplierName,haveIDCard,urgentAmount,idCardBarcode, - allowModifyPackageType,errorRemark,damageRemark,urgentLevel,serialNum,recyclingItemRemark){ + allowModifyPackageType,errorRemark,damageRemark,urgentLevel,serialNum,recyclingItemRemark,note){ var leaf = false; if(taskId != ''){ leaf = true; @@ -1959,7 +1959,8 @@ errorRemark:errorRemark, damageRemark:damageRemark, serialNumber:serialNum, - recyclingItemRemark:recyclingItemRemark + recyclingItemRemark:recyclingItemRemark, + note: note }); if(!leaf){ node.set("checked" ,false); @@ -2133,8 +2134,9 @@ return; } var checked = node.get('checked'); -// alert(node+','+checked) + var note = node.get('note'); +// alert(note+','+checked) if(!Ext.isEmpty(note) && checked){ var width = Ext4.getCmp('materialGrid').getSize().width; alertDiv(note,width); @@ -3317,7 +3319,7 @@ parentNode = addTaskNode('',td_id,'',videoNames,tousseName,0,'','','', '','',tousseType, packageType, sterilingMethod,'',isTraceable,isPrint,isReview,'','',rMaterils,'','',haveIDCard,urgentAmount, - taskVO.idCardBarcode,taskVO.allowModifyPackageType,taskVO.errorRemark,taskVO.damageRemark,taskVO.urgentLevel,'',''); + taskVO.idCardBarcode,taskVO.allowModifyPackageType,taskVO.errorRemark,taskVO.damageRemark,taskVO.urgentLevel,'','',taskVO.note); newParentNode = true; }else{ var uamountStr = parentNode.get('urgentAmount'); @@ -3389,7 +3391,7 @@ var childNode = addTaskNode(taskId,td_id,invoicePlanId,videoNames,tousseName,amount,washTime,basketBarcode,basketName, taskStatus,department,tousseType, packageType,sterilingMethod,dateTime,isTraceable,isPrint,isReview, errors,damages,replenishMaterils,taskType,supplierName,task.haveIDCard,childUrgentAmount,task.idCardBarcode, - task.allowModifyPackageType,task.errorRemark,task.damageRemark,task.urgentLevel,task.serialNumber,task.recyclingItemRemark); + task.allowModifyPackageType,task.errorRemark,task.damageRemark,task.urgentLevel,task.serialNumber,task.recyclingItemRemark,task.note); parentNode.appendChild(childNode); var pNewAmount = parentNode.get('amount') + amount; parentNode.set('amount',pNewAmount);