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

modules/bills_lib/models/bills_lib_interfaces.js

@@ -865,7 +865,9 @@ billsLibDao.prototype.removeTotal = function (data, callback) {
         delJobsArr: function () {
             return function (cb) {
                 async.each(delArr, function (delObj, ecb) {
-                    Bills.update({billsLibId: billsLibId, ID: delObj.updateId, deleted: false}, {$pull: {jobs: {id: delObj.delId}}}, function (err) {
+                    console.log(`delObj`);
+                    console.log(delObj);
+                    Bills.update({billsLibId: billsLibId, ID: delObj.updateID, deleted: false}, {$pull: {jobs: {id: delObj.delId}}}, function (err) {
                         if(err){
                             ecb(err);
                         }else{
@@ -906,7 +908,7 @@ billsLibDao.prototype.removeTotal = function (data, callback) {
         delItemsArr: function () {
             return function (cb) {
                 async.each(delArr, function (delObj, ecb) {
-                    Bills.update({billsLibId: billsLibId, ID: delObj.updateId, deleted:false}, {$pull: {items: {id: delObj.delId}}}, function(err){
+                    Bills.update({billsLibId: billsLibId, ID: delObj.updateID, deleted:false}, {$pull: {items: {id: delObj.delId}}}, function(err){
                         if(err){
                             ecb(err);
                         }

web/maintain/bills_lib/scripts/db_controller.js

@@ -401,15 +401,19 @@ var createObj = {
             if(nodes){
                 nodes.forEach(function(node){
                     node.jobs = new Array();
+                    let spliceArr = [];
                     node.data.jobs.forEach(function(obj){
                         if(me.jobs[me.prefix + obj.id]){
                             node.jobs.push({job: me.jobs[me.prefix + obj.id], serialNo: obj.serialNo});
                             me.jobs[me.prefix + obj.id].count ++;
                         }
                         else {
-                            node.data.jobs.splice(node.data.jobs.indexOf(obj), 1);
+                            spliceArr.push(obj);
                         }
                     });
+                    for(let sItem of spliceArr){
+                        node.data.jobs.splice(node.data.jobs.indexOf(sItem), 1);
+                    }
                 });
             }
         };
@@ -458,15 +462,19 @@ var createObj = {
             if(nodes){
                 nodes.forEach(function(node){
                     node.items = new Array();
+                    let spliceArr = [];
                     node.data.items.forEach(function(obj){
                         if(me.items[me.prefix + obj.id]){
                             node.items.push({item: me.items[me.prefix + obj.id], serialNo: obj.serialNo});
                             me.items[me.prefix + obj.id].count ++;
                         }
                         else {
-                            node.data.items.splice(node.data.items.indexOf(obj), 1);
+                            spliceArr.push(obj);
                         }
                     });
+                    for(let sItem of spliceArr){
+                        node.data.items.splice(node.data.items.indexOf(sItem), 1);
+                    }
                 });
             }
         };