Bläddra i källkod

debug recDAtas

zhongzewei 7 år sedan
förälder
incheckning
c13cb1b8b4
1 ändrade filer med 13 tillägg och 13 borttagningar
  1. 13 13
      web/building_saas/pm/js/pm_gc.js

+ 13 - 13
web/building_saas/pm/js/pm_gc.js

@@ -948,16 +948,16 @@ function m_getRecDatas(oprNode){
         //恢复单价、费率文件
         rstFile = rstFile.concat(getUpdateFiles([oprNode], project));
         if(path === recPath.t){
-            rstProj = rstProj.concat(getUpdateDatas(projectType.tender, oprNode, true, true));
+            rstProj = rstProj.concat(getUpdateDatas(projectType.tender, oprNode, -1, true));
         }
         else if(path === recPath.t_e){
-            rstProj = rstProj.concat(getUpdateDatas(projectType.tender, oprNode, true, false));
-            rstProj = rstProj.concat(getUpdateDatas(projectType.engineering, engineering, true, true));
+            rstProj = rstProj.concat(getUpdateDatas(projectType.tender, oprNode, -1, false));
+            rstProj = rstProj.concat(getUpdateDatas(projectType.engineering, engineering, -1, true));
         }
         else if(path === recPath.t_e_p){
-            rstProj = rstProj.concat(getUpdateDatas(projectType.tender, oprNode, true, false));
-            rstProj = rstProj.concat(getUpdateDatas(projectType.engineering, engineering, true, false));
-            rstProj = rstProj.concat(getUpdateDatas(projectType.project, project, true, false));
+            rstProj = rstProj.concat(getUpdateDatas(projectType.tender, oprNode, -1, false));
+            rstProj = rstProj.concat(getUpdateDatas(projectType.engineering, engineering, -1, false));
+            rstProj = rstProj.concat(getUpdateDatas(projectType.project, project, -1, false));
         }
     }
     else if(oprNode.data.projType === projectType.engineering){
@@ -971,18 +971,18 @@ function m_getRecDatas(oprNode){
         let tenders = oprNode.children;
         if(tenders.length > 0){
             for(let i = 0, len = tenders.length; i < len; i++){
-                rstProj = rstProj.concat(getUpdateDatas(projectType.tender, tenders[i], true, false));
+                rstProj = rstProj.concat(getUpdateDatas(projectType.tender, tenders[i], tenders[i].data.NextSiblingID, false));
             }
             rstProj = deWeightName(rstProj);
             //恢复单价、费率文件
             rstFile = rstFile.concat(getUpdateFiles(tenders, project));
         }
         if(path === recPath.e){
-            rstProj= rstProj.concat(getUpdateDatas(projectType.engineering, oprNode, true, true));
+            rstProj= rstProj.concat(getUpdateDatas(projectType.engineering, oprNode, -1, true));
         }
         else if(path === recPath.e_p){
-            rstProj= rstProj.concat(getUpdateDatas(projectType.engineering, oprNode, true, false));
-            rstProj= rstProj.concat(getUpdateDatas(projectType.project, project, true, false));
+            rstProj= rstProj.concat(getUpdateDatas(projectType.engineering, oprNode, -1, false));
+            rstProj= rstProj.concat(getUpdateDatas(projectType.project, project, -1, false));
         }
     }
     else if(oprNode.data.projType === projectType.project){
@@ -992,13 +992,13 @@ function m_getRecDatas(oprNode){
             let allTenders = [], rstEngs = [];
             for(let i = 0, len = engineerings.length; i < len; i++){
                 //恢复单项工程
-                rstEngs = rstEngs.concat(getUpdateDatas(projectType.engineering, engineerings[i], false, false));
+                rstEngs = rstEngs.concat(getUpdateDatas(projectType.engineering, engineerings[i], engineerings[i].data.NextSiblingID, false));
                 let tenders = engineerings[i].children;
                 allTenders = allTenders.concat(tenders);
                 let rstTends = [];
                 for(let j = 0, jLen = tenders.length; j < jLen; j++){
                     //恢复单位工程
-                    rstTends = rstTends.concat(getUpdateDatas(projectType.tender, tenders[j], false, false));
+                    rstTends = rstTends.concat(getUpdateDatas(projectType.tender, tenders[j], tenders[j].data.NextSiblingID, false));
                 }
                 //去除重名
                 rstTends = deWeightName(rstTends);
@@ -1360,7 +1360,7 @@ function getUpdateDatas(updateType, node, mtNID, mtPM){
         }
         //恢复
         if(mtNID){
-            rst.push(getUpdateObj(updateType, {ID: node.data.ID}, {name: newName, deleteInfo: null, NextSiblingID: -1}));
+            rst.push(getUpdateObj(updateType, {ID: node.data.ID}, {name: newName, deleteInfo: null, NextSiblingID: mtNID}));
         }
         else {
             rst.push(getUpdateObj(updateType, {ID: node.data.ID}, {name: newName, deleteInfo: null}));