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

modules/all_models/std_fee_rate_libs.js

@@ -16,10 +16,21 @@ let optionSchema = new Schema({
     value:String,
     selected:Boolean
 }, {_id: false});
+let subRecord = new Schema({
+    ID:Number,
+    name:String,
+    amount: Number,//倍数
+    value: Number,
+}, {_id: false});
 
 let recordSchema = new Schema({
     ID:Number,
     name:String,
+    editable:Boolean,
+    step: Number,//每增加的步数
+    amount: Number,//倍数
+    value: Number,
+    subList:[subRecord],
     optionList:[optionSchema]
 }, {_id: false});
 
@@ -39,6 +50,7 @@ let ratesSchema = new Schema({
     name: String,
     rate: Number,
     memo: String,
+    sum:Boolean,
     subFeeRate:subFeeRatesSchema
 }, {_id: false});
 

modules/common/const/bills_fixed.js

@@ -53,7 +53,9 @@ const fixedFlag = {
     //施工机械
     CONSTRUCTION_MACHINE:25,
     //暂列金额
-    PROVISIONAL:26
+    PROVISIONAL:26,
+    //安全生产费
+    SAFE_COST:27
 };
 /*建筑安装工程费、土地使用及拆迁补偿费、养护工程其他费用、预备费、基本预备费、价差预备费、一二三四部分合计、贷款利息、总造价、
 
@@ -86,7 +88,8 @@ const fixedFlagList = [
     {name: "劳务", value: fixedFlag.LABOUR_SERVICE},
     {name: "材料", value: fixedFlag.MATERIAL},
     {name: "施工机械", value: fixedFlag.CONSTRUCTION_MACHINE},
-    {name: "暂列金额", value: fixedFlag.PROVISIONAL}
+    {name: "暂列金额", value: fixedFlag.PROVISIONAL},
+    {name:"安全生产费",value:fixedFlag.SAFE_COST}
 ];
 
 export {fixedFlag as default, fixedFlagList as List};