Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp =================================================================== diff -u -r17512 -r18240 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 17512) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 18240) @@ -115,7 +115,8 @@ - + + Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r18235 -r18240 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 18235) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 18240) @@ -413,11 +413,12 @@ dataIndex: 'urgentAmount', renderer: function(v,p,record,rowIndex, columnIndex, store,view){ if(v > 0){ - if(record.get("leaf")){ + /*if(record.get("leaf")){ return null ; }else{ return "
" + v + "
"; - } + }*/ + return "" + v + "
"; }else{ return null; } @@ -2944,6 +2945,14 @@ taskVO.idCardBarcode,taskVO.allowModifyPackageType,taskVO.errorRemark,taskVO.damageRemark,taskVO.urgentLevel); 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;