Browse Source

feat: 审核比对下拉显示问题

zhangweicheng 4 years ago
parent
commit
717b3d7cb7
1 changed files with 6 additions and 5 deletions
  1. 6 5
      web/building_saas/main/js/views/project_property_compare.js

+ 6 - 5
web/building_saas/main/js/views/project_property_compare.js

@@ -71,8 +71,8 @@ let compareObject = {
         let rootParjects = parentMap['-1'];
         let options = [];
         for(let r of rootParjects){
-            [newPath,project] =  setProjectPath(r,parentMap,"");
-            if(newPath && project)options.push({path:newPath,ID:project.ID})
+             setProjectPath(r,parentMap,"");
+            //if(newPath && project)options.push({path:newPath,ID:project.ID})
         }   
         compareObject.options = options;
         let rootProject  = _.find(projects,{'ID':projectObj.project.property.rootProjectID});
@@ -80,11 +80,12 @@ let compareObject = {
 
         function setProjectPath(project,parentMap,namePath){
             let newPath = project.ParentID == -1?project.name:`${namePath}/${project.name}`;
-            if(project.projType === commonConstants.projectType.Project) return [newPath,project];
-            
+            if(project.projType === commonConstants.projectType.Project){
+                options.push({path:newPath,ID:project.ID});
+            } 
             if(parentMap[project.ID]){
                 for(let c of parentMap[project.ID]){
-                   return setProjectPath(c,parentMap,newPath)
+                    setProjectPath(c,parentMap,newPath);
                 }
             }
         }