bugs

public/web/gljUtil.js

@@ -87,14 +87,16 @@ let gljUtil = {
             }
         }
         //2019-11-07 定额类型工料机已经屏蔽，如果打开，记得加上调价后的消耗量
-        /*for(let ra of rations){//计算定额类型工料机的消耗量
+        for(let ra of rations){//计算定额类型工料机的消耗量
             if(ra.type == this.rationType.gljRation&&ra.projectGLJID===pglj.id){
                 let r_quantity = scMathUtil.roundForObj(ra.quantity,q_decimal);
                 r_quantity = r_quantity?r_quantity:0;
-                if(isTender == true){
-                    r_quantity = this.getRationTenderQuantity(ra,q_decimal,scMathUtil);
+                let tender_r_quantity = r_quantity;
+                if(!pglj.is_adjust_price){
+                  tender_r_quantity = this.getRationTenderQuantity(ra,q_decimal,scMathUtil);
                 }
                 quantity_sum = scMathUtil.roundForObj(quantity_sum+r_quantity,q_decimal);
+                tender_qantity_sum = scMathUtil.roundForObj(tender_qantity_sum+tender_r_quantity,q_decimal);
                 if(_.includes(billIDs,ra.billsItemID)){//计算分部分项
                     sum = scMathUtil.roundForObj(sum+r_quantity,q_decimal);
                 }
@@ -102,7 +104,7 @@ let gljUtil = {
                     tech_sum = scMathUtil.roundForObj(tech_sum+r_quantity,q_decimal);
                 }
             }
-        }*/
+        } 
         result.subdivisionQuantity = sum;
         result.techQuantity = tech_sum;
         result.quantity = quantity_sum;

web/building_saas/main/js/views/glj_view.js

@@ -1093,7 +1093,7 @@ var gljOprObj = {
     updateRationTypeGLJ: function (value, node, fieldName,editingText) {
         let newval;
         let updatePrice = false;
-        if (fieldName == "marketUnitFee") {
+        if (fieldName == "marketUnitFee"|| fieldName == "feesIndex.common.unitFee") {
             updatePrice = true;
             if (value == null) {
                 newval = 0;