Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsAppHelper.js =================================================================== diff -u -r15926 -r17297 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsAppHelper.js (.../goodsAppHelper.js) (revision 15926) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsAppHelper.js (.../goodsAppHelper.js) (revision 17297) @@ -24,7 +24,7 @@ var me = this; var foundNode = null; var rootNode = treeStore.getRootNode(); - checkFn = checkFn || me.checkTousseDefinitionID; + checkFn = checkFn || me.checkTousseDefinitionIDAndType; rootNode.cascadeBy(function (n) { if (n.parentNode == rootNode) { if (checkFn(n, node)) { @@ -50,14 +50,15 @@ } /** - * 检验tousseDefinitionID + * 检验tousseDefinitionID和类型 * @param storeNode store的节点 * @param needToCheckNode 需要校验的节点 * @returns 如果返回true则表示找到 */ - goodsAppDomObj.checkTousseDefinitionID = function (storeNode, needToCheckNode) { + goodsAppDomObj.checkTousseDefinitionIDAndType = function (storeNode, needToCheckNode) { + var tousseType = needToCheckNode.tousseType; var tousseDefinitionID = needToCheckNode.tousseDefinitionID; - return storeNode.get('tousseDefinitionID') == tousseDefinitionID; + return storeNode.get('tousseDefinitionID') == tousseDefinitionID && storeNode.get('tousseType') == tousseType; } return new GoodsAppHelperFactory();