Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsAppHelper.js =================================================================== diff -u -r15924 -r15925 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsAppHelper.js (.../goodsAppHelper.js) (revision 15924) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsAppHelper.js (.../goodsAppHelper.js) (revision 15925) @@ -26,11 +26,13 @@ var rootNode = treeStore.getRootNode(); checkFn = checkFn || me.checkTousseDefinitionID; rootNode.cascadeBy(function (n) { - var checkNode = checkFn(n, rootNode, node); - if (!Ext4.isEmpty(checkNode)) { - foundNode = checkNode; - //return false是终止循环遍历,但好像不无效,所以这里要多加一个checkNode赋值 - return false; + if (n.parentNode == rootNode) { + var checkNode = checkFn(n, rootNode, node); + if (!Ext4.isEmpty(checkNode)) { + foundNode = checkNode; + //return false是终止循环遍历,但好像无效,所以这里要多加一个checkNode赋值 + return false; + } } }); return foundNode; @@ -39,37 +41,28 @@ /** * 检验名字和类型 * @param storeNode store的节点 - * @param rootNode 根节点 * @param needToCheckNode 需要校验的节点 * @returns {*} */ - goodsAppDomObj.checkNameAndType = function (storeNode, rootNode, needToCheckNode) { + goodsAppDomObj.checkNameAndType = function (storeNode, needToCheckNode) { var tousseType = needToCheckNode.tousseType; var name = needToCheckNode.name; - // var foundNode = null; if (storeNode.get('name') == name && storeNode.get('tousseType') == tousseType) { - if (storeNode.parentNode == rootNode) { - return storeNode; - } + return storeNode; } return null; } /** * 检验tousseDefinitionID * @param storeNode store的节点 - * @param rootNode 根节点 * @param needToCheckNode 需要校验的节点 * @returns {*} */ - goodsAppDomObj.checkTousseDefinitionID = function (storeNode, rootNode, needToCheckNode) { - var foundNode = null; - // var foundNode = null; + goodsAppDomObj.checkTousseDefinitionID = function (storeNode, needToCheckNode) { var tousseDefinitionID = needToCheckNode.tousseDefinitionID; if (storeNode.get('tousseDefinitionID') == tousseDefinitionID) { - if (storeNode.parentNode == rootNode) { - return storeNode; - } + return storeNode; } return null; }