bug fixed

modules/all_schemas/delete_schema.js

@@ -9,7 +9,7 @@ var Schema = mongoose.Schema;
 var deleteSchema = new Schema({
     deleted: Boolean,
     deleteDateTime: Date,
-    deleteBy: Number // userID
+    deleteBy: String // userID
 });
 
 module.exports = deleteSchema;

web/building_saas/main/js/models/calc_program.js

@@ -1406,9 +1406,7 @@ class CalcProgram {
     calculate(treeNode, calcParents = true, calcFormulas = true){
         let me = this;
         let changedNodes = [];
-
         me.innerCalc(treeNode, changedNodes);
-
         if (treeNode.changed) {
             // 计算父结点
             if (calcParents){
@@ -1418,7 +1416,6 @@ class CalcProgram {
                     curNode = curNode.parent;
                 };
             };
-
             // 父结点算完，再计算所有的公式结点(必须先算完父结点，再算公式结点)
             if (calcFormulas) {
                 me.calcFormulaNodes(changedNodes);
@@ -1437,7 +1434,6 @@ class CalcProgram {
     calcAllNodes(calcType = calcAllType.catAll){
         let me = this;
         let changedNodes = [];
-
         function calcNodes(nodes) {
             for (let node of nodes) {
                 if (node.children.length > 0) {
@@ -1449,9 +1445,7 @@ class CalcProgram {
                 };
             }
         };
-
         calcNodes(me.project.mainTree.roots);
-
         me.calcFormulaNodes(changedNodes);
         return changedNodes;
     };
@@ -1499,7 +1493,6 @@ class CalcProgram {
     // 计算多条零散的定额，并计算他们所属的清单、父级清单，然后打包存储。如：批量替换工料机后受影响的定额。
     calcRationsAndSave(rationNodes, callback){
         let me = this, leafBills = [], allChangedNodes = [];
-        let startTime = +new Date();
         for (let node of rationNodes) {
             me.innerCalc(node, allChangedNodes);
             let leafBill = node.parent;
@@ -1512,8 +1505,6 @@ class CalcProgram {
             mergeArr(allChangedNodes, curChangeds);
         };
         let endShowTime = +new Date();
-        console.log(`计算所需时间——${endShowTime - startTime}`);
-        console.log(allChangedNodes);
         me.saveNodes(allChangedNodes, callback);
     };
 
@@ -1536,10 +1527,7 @@ class CalcProgram {
     };
 
     calcAllNodesAndSave(calcType = calcAllType.catAll, callback){
-        let startTime = +new Date();
         let changedNodes = this.calcAllNodes(calcType);
-        let endShowTime = +new Date();
-        console.log(`计算所需时间——${endShowTime - startTime}`);
         this.saveNodes(changedNodes, callback);
     };
 

web/building_saas/main/js/models/installation_fee.js

@@ -213,6 +213,7 @@ var installation_fee = {
             let billSerialMap = {};
             let FBMap = {};//保存分部下对应的补项
             let usedBXMap = {};//有使用到的补项
+            let startTime =  +new Date();
             if(engineering!=engineeringType.BUILD_IN){//如果不是安装工程，则不用计算
                 if(callback) callback(false);
                 return;
@@ -295,7 +296,6 @@ var installation_fee = {
                 $.bootstrapLoading.start();
                 CommonAjax.post("/project/calcInstallationFee",updateData,function (data) {
                     //提交后台成功后所做的操作，删除要先删除定额，再删除清单，添加要先添加清单再添加定额
-                    console.log(data);
                     project.ration_glj.addDatasToList(data.add);//添加插入的定额
                     for(let ur of data.update){
                         let glj = project.ration_glj.getDataByID(ur.ID);
@@ -309,6 +309,8 @@ var installation_fee = {
                         addNewNodes(updateData);
                     });
                     setTreeSelection(selectedNode);
+                    let endTime =  +new Date();
+                    console.log(`计算安装增加费时间——${endTime - startTime}`);
                     projectObj.project.projectGLJ.loadData(function () {
                         cbTools.refreshFormulaNodes();
                         if(callback){
@@ -345,7 +347,6 @@ var installation_fee = {
                     newAddNode.push(newNode);
                     project.Ration.datas.push(nr);
                 }
-                console.log("add nodes");
                 TREE_SHEET_HELPER.refreshTreeNodeData(controller.setting, controller.sheet, newAddNode, false);
             }
 

web/building_saas/main/js/models/ration.js

@@ -471,7 +471,6 @@ var Ration = {
                 $.bootstrapLoading.start();
                 CommonAjax.post("/ration/addNewRation",{itemQuery:itemQuery,newData:newData,calQuantity:calQuantity,brUpdate:brUpdate,needInstall:needInstall},function (data) {
                     //更新缓存
-                    console.log(data);
                     me.datas.push(data.ration);
                     project.ration_glj.addDatasToList(data.ration_gljs);
                     project.ration_coe.addDatasToList(data.ration_coes);
@@ -487,16 +486,19 @@ var Ration = {
                     project.projectGLJ.loadData(function () {
                         project.ration_glj.addToMainTree(data.ration_gljs);
                         projectObj.mainController.refreshTreeNode([newNode], false);
-                   /*     if(project.Bills.isFBFX(newNode)) { //判断是否属于分部分项工程 ，是的话才需要做计取安装费计算
+                        if(project.Bills.isFBFX(newNode)) { //判断是否属于分部分项工程 ，是的话才需要做计取安装费计算
+                            let changeNodes = project.calcProgram.calculate(newNode);//先计算不保存,如果计算安装增加费后不用自动计算，则单独调用保存的方法
                             project.installation_fee.calcInstallationFee(function (isChange) {
                                 if(isChange){
-                                    project.calcProgram.calcAllNodesAndSave();
+                                   project.calcProgram.calcAllNodesAndSave();
+                                }else {
+                                    project.calcProgram.saveNodes(changeNodes);
                                 }
                             });
                         }else {
                             project.calcProgram.calcAndSave(newNode);
-                        }*/
-                        project.calcProgram.calcAndSave(newNode,function () {
+                        }
+                     /*   project.calcProgram.calcAndSave(newNode,function () {
                             if(project.Bills.isFBFX(newNode)) { //判断是否属于分部分项工程 ，是的话才需要做计取安装费计算
                                 project.installation_fee.calcInstallationFee(function (isChange) {
                                     if(isChange){
@@ -504,10 +506,9 @@ var Ration = {
                                     }
                                 });
                             }
-                        });
+                        });*/
                         $.bootstrapLoading.end();
                     });
-                    console.log(data);
                 })
             }