Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost

config/config.js

@@ -10,7 +10,7 @@ module.exports = {
             auth: {
                 "authdb": "admin"
               },
-            connectTimeoutMS: 20000,
+            connectTimeoutMS: 50000,
             useMongoClient: true
         }
     },

modules/pm/controllers/pm_controller.js

@@ -384,14 +384,14 @@ module.exports = {
                 await feeRateFileModel.bulkWrite(bulkFFs);
             }
             callback(request, response, 0, 'success', null);
-        }
-        catch(err){
+        } catch(err){
             callback(request, response, 1, err, null);
-        }    },
-moveProject:async function(req,res){
+        }
+    },
+    moveProject:async function(req,res){
         let result={
             error:0
-        }
+        };
         try {
             let data = req.body.data;
             let rdata= await pm_facade.moveProject(data);

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}));

web/building_saas/pm/js/pm_newMain.js

@@ -174,7 +174,6 @@ const projTreeObj = {
         me.initSelection(args.newSelections[0], args.oldSelections[0]);
     },
     onDragDropBlock : function (sender,args) {//拖动移动项目位置
-        console.log(args);
         let selected = projTreeObj.tree.selected;
         let targetNode = projTreeObj.tree.items[args.toRow];
         let projectMap = {},feeRateMap={},unitPriceMap = {},parent=null,next = null;
@@ -237,25 +236,18 @@ const projTreeObj = {
         }
         $.bootstrapLoading.start();
         moveProjects({"user_id": userID,rootProjectID:rootProjectID,projectMap:projectMap,feeRateMap:feeRateMap,unitPriceMap:unitPriceMap},function (result) {
-            console.log(result);
             for(let key in result){//更新前端节点数据
                 let updateData = result[key].update;
                 let node = projTreeObj.tree.findNode(result[key].query.ID);
                 if(node){
-                    console.log(node.data);
                     for(let ukey in updateData){
                         _.set(node.data,ukey,updateData[ukey]);
                     }
-                    console.log(node.data);
                 }
             }
             projTreeObj.moveTo(selected,targetNode,parent,next);
             $.bootstrapLoading.end();
         });
-      //  projTreeObj.moveTo(selected,targetNode,parent,next);
-        //删除行数
-
-
         function getMoveUpdateData(sel,target,projectMap,sameLevel) {
             let tem_parent = null,tem_next = null;
             if(sameLevel==true){//移动后的位置的级别相同