bugs

modules/all_models/project_glj.js

@@ -65,6 +65,16 @@ let modelSchema = {
         type: Number,
         default: 0
     },
+    //不计税设备
+    no_tax_eqp:{
+        type: Number,
+        default: 0
+    },
+    //评标材料
+    is_eval_material:{
+        type: Number,
+        default: 0
+    },
     // 调整系数ID
     adjCoe: Number,
 
@@ -87,7 +97,6 @@ let modelSchema = {
     quantity: String,
     techQuantity:String,//技术措施项目消耗量
     subdivisionQuantity:String,//分部分项消耗量
-    // 不调价
     tenderPrice: String,//调整后价格
     // 显示组成物的消耗量
     consumption: String,

modules/glj/controllers/glj_controller.js

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

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

@@ -45,6 +45,8 @@ let gljCol = {
             {headerName: "暂估", headerWidth: 45, dataCode: "is_evaluate", hAlign: "center", dataType: "String",cellType:'checkBox'},
             {headerName: "主要\n材料", headerWidth: 45, dataCode: "is_main_material", hAlign: "center", dataType: "String",cellType:'checkBox'},
             {headerName: "不调价", headerWidth: 55, dataCode: "is_adjust_price", dataType: "String",cellType: "checkBox"},
+            {headerName: "不计税设备", headerWidth: 55, dataCode: "no_tax_eqp", dataType: "String",cellType: "checkBox"},
+            {headerName: "评标材料", headerWidth: 35, dataCode: "is_eval_material", dataType: "String",cellType: "checkBox"},
             {headerName: "供货方式", headerWidth: 70, dataCode: "supply", hAlign: "center", dataType: "String",cellType:'comboBox',editorValueType:true,options:supplyComboMap},
             {headerName: "甲供数量", headerWidth: 90, dataCode: "supply_quantity", hAlign: "right", dataType: "Number",validator:"number",decimalField:'glj.quantity'},
             {headerName: "三材类别", headerWidth: 70, dataCode: "materialType", hAlign: "center", dataType: "String",cellType:'comboBox',editorValueType:true,options:materialComboMap},

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

@@ -685,13 +685,15 @@ projectGljObject={
 
         data.is_main_material = glj.is_main_material == 1?1:0;
         //供货方式为完全甲供时设置甲供数量为总消耗量
-        if (data.supply == 2) {
-            data.supply_quantity = glj.quantity;
-        }
+        if (data.supply == 2) data.supply_quantity = glj.quantity;
+
         // 只有材料才显示是否暂估
-        if (materialIdList.indexOf(glj.type) >= 0) {
-            data.is_evaluate = glj.is_evaluate;
-        }
+        if (materialIdList.indexOf(glj.type) >= 0) data.is_evaluate = glj.is_evaluate;
+        //是“材料”、“主材”、“设备”时显示评标材料
+        if (materialIdList.indexOf(glj.type) >= 0||glj.type == gljType.MAIN_MATERIAL || glj.type == gljType.EQUIPMENT) data.is_eval_material = glj.is_eval_material ? glj.is_eval_material : 0;
+        //类型是“设备”时有效
+        if(glj.type == gljType.EQUIPMENT) data.no_tax_eqp = glj.no_tax_eqp?glj.no_tax_eqp:0;
+
         if(glj.materialCoe !== null && glj.materialCoe !==undefined){
             data.materialCoe =  scMathUtil.roundForObj(glj.materialCoe,getDecimal("material"));
         }
@@ -901,7 +903,7 @@ projectGljObject={
             if(dataCode === 'supply_quantity'){//修改数量需做4舍5入
                 value=  scMathUtil.roundForObj(value,getDecimal('glj.quantity'));
             }
-            if(dataCode === 'is_evaluate'||dataCode === 'is_adjust_price'||dataCode === 'is_main_material'){
+            if(dataCode === 'is_evaluate'||dataCode === 'is_adjust_price'||dataCode === 'is_main_material'||dataCode === 'no_tax_eqp'||dataCode == 'is_eval_material'){
                 if(value == true){
                     value = 1;
                 }else if(value == false){