bugs.

modules/pm/controllers/pm_controller.js

@@ -66,14 +66,20 @@ module.exports = {
     updateMixDatas: function(req, res){
         let callBackInner = function (err, message, data) {
             if (err === 0) {
-                callback(req, res, err, message, data);
+                res.json({error: err, message: message, data: data});
             } else {
-                callback(req, res, err, message, null);
+                res.json({error: err, message: message, data: null});
             }
         };
 
         let datas = JSON.parse(req.body.data).mixDataArr;
 
+        // 项目属性
+        if (Object.keys(datas.properties).length > 0){
+            projectModel.update({ID: datas.projectID}, datas.properties, callBackInner);
+        };
+
+        // 人工系数
         if (datas.labourCoes.updateData){
             datas.labourCoes.updateData.projectID = datas.projectID;
             labourCoe.save(datas.labourCoes.updateData, callBackInner);
@@ -92,10 +98,6 @@ module.exports = {
                 rationsModel.update({projectID: datas.projectID, ID: ration.ID, deleteInfo: null}, ration, callBackInner);
             };
         };
-
-        if (Object.keys(datas.properties).length > 0){
-            projectModel.update({ID: datas.projectID}, datas.properties, callBackInner);
-        };
     },
     updateFiles: async function(req, res){
         let data = JSON.parse(req.body.data);