bugs.

modules/main/controllers/labour_coe_controller.js

@@ -44,12 +44,12 @@ async function getStdLabourCoe(req, res) {
 function save(req, res) {
     let result = {error: 0, message: '', data: null};
 
-    labourCoeFacade.save(req.body.data, function (err, message, data) {
-        if (err == 0){
+    labourCoeFacade.save(req.body.data, function (err, data) {
+        if (err == ''){
             result.data = data;
         }else{
             result.error = 1;
-            result.message = message;
+            result.message = err;
         }
     });
 

modules/main/facade/labour_coe_facade.js

@@ -112,12 +112,10 @@ function save (data, callback) {
     projectLabourCoesModel.bulkWrite(updateArr)
         .then(function(){
             logger.info(`Project LabourCoe saved successful : ${data.projectID}`);
-            // callback(0, '', null);
             callback('', null);
         })
         .catch(function (err) {
-            logger.err(err);
-            // callback(1, err, null)
+            logger.err('labourCoe save error: ' + err);
             callback(err, null)
         });
 }

modules/pm/controllers/pm_controller.js

@@ -83,21 +83,17 @@ module.exports = {
 
         // 项目属性
         if (Object.keys(datas.properties).length > 0){
-            // projectModel.update({ID: datas.projectID}, datas.properties, callBackInner);
             functions.push(updateFunc(projectModel, {ID: datas.projectID}, datas.properties));
         };
 
         // 人工系数
         if (datas.labourCoes.updateData){
-            // datas.labourCoes.updateData.projectID = datas.projectID;
-            // labourCoe.save(datas.labourCoes.updateData, callBackInner);
             functions.push(updateLC());
         };
 
         // 清单：每文档doc只存储一条清单，每条清单都必须定位一次文档，无法合并处理
         if (datas.bills.length > 0){
             for (let bill of datas.bills){
-                // billsModel.update({projectID: datas.projectID, ID: bill.ID, deleteInfo: null}, bill, callBackInner);
                 functions.push(updateFunc(billsModel, {projectID: datas.projectID, ID: bill.ID, deleteInfo: null}, bill));
             };
         };
@@ -105,7 +101,6 @@ module.exports = {
         // 定额：每文档doc只存储一条定额，每条定额都必须定位一次文档，无法合并处理
         if (datas.rations.length > 0){
             for (let ration of datas.rations){
-                // rationsModel.update({projectID: datas.projectID, ID: ration.ID, deleteInfo: null}, ration, callBackInner);
                 functions.push(updateFunc(rationsModel, {projectID: datas.projectID, ID: ration.ID, deleteInfo: null}, ration));
             };
         };