增加采保费率

modules/all_models/project_glj.js

@@ -131,6 +131,7 @@ let modelSchema = {
     vender:String, //厂家
     qualityGrace:String,//质量等级
     brand:String,//品牌
+    premiumRate:Number,//采保费率
     subList:[Schema.Types.Mixed]
 };
 mongoose.model(collectionName, new Schema(modelSchema, {versionKey: false}));

modules/glj/controllers/glj_controller.js

@@ -105,7 +105,7 @@ class GLJController extends BaseController {
         try {
             // 可编辑的字段
             let editableField = ['is_evaluate','unit_price.taxRate', 'unit_price.market_price', 'is_adjust_price', 'mix_ratio.consumption','is_eval_material','no_tax_eqp','is_coe_adjust','is_info_adjust','FI','FO','standardPrice','riskCoe',
-                'supply', 'supply_quantity','delivery_address','delivery','materialType','materialCoe','is_main_material','originPlace','vender','qualityGrace','brand','remark'];
+                'supply', 'supply_quantity','delivery_address','delivery','materialType','materialCoe','is_main_material','originPlace','vender','qualityGrace','brand','remark','premiumRate'];
             if (editableField.indexOf(field) < 0) {
                 throw '对应字段不能编辑';
             }

web/building_saas/main/js/views/glj_col.js

@@ -58,6 +58,7 @@ let gljCol = {
             {headerName: "三材类别", headerWidth: 70, dataCode: "materialType", hAlign: "center", dataType: "String",cellType:'comboBox',editorValueType:true,options:materialComboMap,spanRows: [2]},
             {headerName: "三材系数", headerWidth: 70, dataCode: "materialCoe", hAlign: "right", dataType: "Number",validator:"number",spanRows: [2]},//,decimalField:'material'
             {headerName: "交货方式", headerWidth: 70, dataCode: "delivery", hAlign: "left", dataType: "String",spanRows: [2]},
+            {headerName: "采保费率%", headerWidth: 70, dataCode: "premiumRate", hAlign: "right", dataType: "Number",validator:"number",spanRows: [2]},
             {headerName: "送达地点", headerWidth: 70, dataCode: "delivery_address", hAlign: "left", dataType: "String",spanRows: [2]},
             {headerName: "产地", headerWidth: 80, dataCode: "originPlace", hAlign: "left", dataType: "String",spanRows: [2]},
             {headerName: "厂家", headerWidth: 80, dataCode: "vender", hAlign: "left", dataType: "String",spanRows: [2]},

web/building_saas/main/js/views/project_glj_view.js

@@ -1210,7 +1210,8 @@ let projectGljObject = {
       brand: glj.brand,
       unitPriceID: glj.unit_price.id,
       priceFrom: glj.unit_price.priceFrom,
-      remark: glj.remark
+      remark: glj.remark,
+      premiumRate:glj.premiumRate,
     };
     gljOprObj.setGLJPrice(data, glj);
 
@@ -1483,6 +1484,7 @@ let projectGljObject = {
         value = scMathUtil.roundForObj(value, getDecimal("material"));
       }
       if (dataCode == 'taxRate') value = scMathUtil.roundToString(value, 2);
+      if (dataCode == 'premiumRate') value = scMathUtil.roundToString(value, getDecimal('feeRate'));
 
       extend = Object.keys(extend).length > 0 ? JSON.stringify(extend) : '';
       if (recode[dataCode] == value) return;