Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r18154 -r18156 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 18154) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 18156) @@ -2722,12 +2722,11 @@ if(idCardBarcodeTemp != ""){ loadIdCardByBarcode(idCardBarcodeTemp); } - + refreshErrorAndDamageRemark(record); var isLeaf = record.get('leaf'); if(!isLeaf){ if(record.get('checked') == false){ record.set('checked', true); - refreshErrorAndDamageRemark(record); basketColumnTreeGrid.getView().fireEvent('checkchange'); } }else{ @@ -2814,6 +2813,15 @@ sterilingMethod,'',isTraceable,isPrint,isReview,'','',rMaterils,'','',haveIDCard,urgentAmount, taskVO.idCardBarcode,taskVO.allowModifyPackageType,taskVO.errorRemark,taskVO.damageRemark); newParentNode = true; + }else{ + var errorRemark = parentNode.get('errorRemark'); + var damageRemark = parentNode.get('damageRemark'); + errorRemark = errorRemark ? errorRemark:''; + damageRemark = damageRemark ? damageRemark:''; + errorRemark += taskVO.errorRemark ? taskVO.errorRemark : ''; + damageRemark += taskVO.damageRemark ? taskVO.damageRemark : ''; + parentNode.set('errorRemark',errorRemark); + parentNode.set('damageRemark',damageRemark); } var cLength = taskVO.children.length; @@ -2990,11 +2998,11 @@ }else{ Ext4.getCmp('idCardName').setValue(""); } + refreshErrorAndDamageRemark(record); var isLeaf = record.get('leaf'); if(!isLeaf){ if(record.get('checked') == false){ record.set('checked', true); - refreshErrorAndDamageRemark(record); waitPackColumnTreeGrid.getView().fireEvent('checkchange'); } }else{