人工系数。

modules/complementary_glj_lib/routes/routes.js

@@ -26,4 +26,4 @@ module.exports = function (app) {
 
     app.use("/complementartGlj/api", router);
 
-};
+};

modules/fee_rates/facade/fee_rates_facade.js

@@ -202,6 +202,7 @@ async function getFeeRateData(projectID) {
                 feeRateData._doc.rates = feeRate?feeRate.rates:[];
                 //
                 feeRateData._doc.usageProjects=await getUsageProjects(feeRateData.ID);
+                console.log(feeRateData._doc);
                 result.datas = feeRateData;
             }
         }else {

modules/main/controllers/labour_coe_controller.js

@@ -0,0 +1,40 @@
+/**
+ * Created by CSL on 2017-10-10.
+ */
+
+const uuidV1 = require('uuid/v1');
+let mongoose = require('mongoose');
+let logger = require("../../../logs/log_helper").logger;
+let stdLabourCoesModel = mongoose.model('stdLabourCoes');
+let projectLabourCoesModel = mongoose.model('projectLabourCoes');
+
+module.exports = {
+    createNewProjectLabourCoe: createNewProjectLabourCoe,
+    getProjectLabourCoe: getProjectLabourCoe,
+    getStdLabourCoe: getStdLabourCoe
+};
+
+async function createNewProjectLabourCoe(req, res) {
+    let result={
+        error:0
+    };
+    try {
+        let data = req.body.data;
+        data = JSON.parse(data);
+        let feeRateStandards= await feeRateFacde.getFeeRateStandardsByProjectID(data.projectID);
+        result.data= feeRateStandards;
+    }catch (err){
+        console.log(err);
+        result.error=1;
+        result.message = err.message;
+    }
+    res.json(result);
+};
+
+async function getProjectLabourCoe(req, res) {
+
+};
+
+async function getStdLabourCoe(req, res) {
+
+};

modules/main/facade/labour_coe_facade.js

@@ -1,5 +0,0 @@
-/**
- * Created by CSL on 2017-09-29.
- */
-let mongoose = require('mongoose');
-let stdLabourCoeModel = mongoose.model('stdLabourCoes');

modules/main/models/labour_coe.js

@@ -12,11 +12,20 @@ let coeSchema = new Schema({
 },{versionKey:false,_id: false});
 
 let stdLabourCoes = new Schema({
-    ID: String,
+    ID: Number,
     region: String,
     libName: String,
+    coes: [coeSchema]
+},{versionKey:false,_id: false});
+
+let projectLabourCoes = new Schema({
+    ID: Number,
+    projectID: Number,
+    name: String,
+    libID: Number,
+    libName: String,
     coes: [coeSchema],
-    _id: false
-},{versionKey:false});
+},{versionKey:false,_id: false});
 
-mongoose.model('std_labour_coes', stdLabourCoes, 'std_labour_coes');
+mongoose.model('std_labour_coes', stdLabourCoes, 'std_labour_coes');
+mongoose.model('labour_coes', projectLabourCoes, 'labour_coes');

modules/main/routes/labour_coe_route.js

@@ -0,0 +1,27 @@
+/**
+ * Created by CSL on 2017-10-12.
+ */
+
+let express = require('express');
+let lcController = require('../controllers/labour_coe_controller');
+
+module.exports = function (app) {
+
+    var lcRouter = express.Router();
+
+    lcRouter.post('/getProjectLabourCoe', lcController.getProjectLabourCoe);
+    lcRouter.post('/createNewProjectLabourCoe', lcController.createNewProjectLabourCoe);
+    lcRouter.post('/getStdLabourCoe', lcController.getStdLabourCoe);
+
+    // lcRouter.post('/changeFeeRateStandard', frController.changeFeeRateStandard);
+    // lcRouter.post('/checkFeeRateName', frController.checkFeeRateName);
+    // lcRouter.post('/getChangeInfo', frController.getChangeInfo);
+    // lcRouter.post('/changeFeeRateFileFromCurrent', frController.changeFeeRateFileFromCurrent);
+    // lcRouter.post('/changeFeeRateFileFromOthers', frController.changeFeeRateFileFromOthers);
+
+    app.use('/labourCoe',lcRouter);
+}
+
+
+
+

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

@@ -164,7 +164,6 @@ let calcTemplates = [
                 name: "人工费价差",
                 fieldName: "labourDiff",
                 dispExpr: "[人工费价差]",
-                // expression: "base('市场价格人工费') - base('定额基价人工费(调整后)')",
                 expression: "base('人工费价差')",
                 compiledExpr: "",
                 statement: "市场价格人工费-调整后的定额人工费(基价)"