Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r29903 -r29911 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 29903) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 29911) @@ -4275,7 +4275,6 @@ } } } - var speakBasket = new SpeakBasket(); for(var n = 0;n < nLength; n++){ var taskVO = taskList[n]; @@ -4299,15 +4298,19 @@ var damageRemark = taskVO.damageRemark; var parentNode = null; + var isChecked = false; rootNode.cascade(function(n) { if(!n.get('leaf') && n.get('tousseName') == tousseName){ parentNode = n; } - }); + if(n.get('checked')){ + isChecked = true; + } + }); var newParentNode = false; var checked = false; if(parentNode == null){ - if(n == 0){ + if(n == 0 && !isChecked){ checked = true; } var params = { @@ -4459,8 +4462,9 @@ var childNode = parentNode.childNodes[j]; var basketName = childNode.data.basketName; basketNameMaxLenArray[k] = textSize(fontSize+"px","宋体",basketName).width || 0; - if(childNode.get("checked") !== true){ - childNode.set("checked", false); + childNode.set("checked", false); + if(parentNode.get("checked") == true){ + childNode.set("checked", true); } k++; } @@ -5401,15 +5405,19 @@ var damageRemark = taskVO.damageRemark; var parentNode = null; + var isChecked = false; rootNode.cascade(function(n) { if(!n.get('leaf') && n.get('tousseName') == tousseName){ parentNode = n; } + if(n.get('checked')){ + isChecked = true; + } }); var newParentNode = false; var checked = false; if(parentNode == null){ - if(n == 0){ + if(n == 0 && !isChecked){ checked = true; } var params = {