隐藏项目工料机的 不调价 选项。

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

@@ -897,7 +897,7 @@ let calcTools = {
     },
 
     // 在项目工料机里检查该工料机是否参与调价
-    isTenderGLJ: function (glj){
+    isTenderProjectGLJ: function (glj){
         let projGLJ = this.getProjectGLJ(glj);
         return !(projGLJ && projGLJ.is_adjust_price == 1);
     },
@@ -921,6 +921,7 @@ let calcTools = {
     tenderCoe_GLJQty: function (treeNode, glj){
         let coe = 1;
         if (!treeNode.data.quantityCoe) return coe;
+        if (!calcTools.isTenderProjectGLJ(glj)) return coe;
 
         if (gljType.LABOUR == glj.type){
             if (treeNode.data.quantityCoe.labour)
@@ -983,7 +984,7 @@ let calcTools = {
         }
         else{
             let coe = 1;
-            if (this.isTenderGLJ(glj))
+            if (this.isTenderProjectGLJ(glj))
                 coe = this.tenderCoe_GLJQty(treeNode, glj);
             glj.tenderQuantity = (glj.quantity * coe).toDecimal(decimalObj.glj.quantity);
         }

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

@@ -62,7 +62,7 @@ let gljCol = {
             {headerName: "质量等级", headerWidth: 80, dataCode: "qualityGrace", hAlign: "left", dataType: "String",spanRows: [2]},
             {headerName: "品牌", headerWidth: 80, dataCode: "brand", hAlign: "left", dataType: "String",spanRows: [2]},
             {headerName: "备注", headerWidth: 100, dataCode: "remark", hAlign: "left", dataType: "String",spanRows: [2]},
-            {headerName: "不调价", headerWidth: 55, dataCode: "is_adjust_price", dataType: "String",cellType: "checkBox",spanRows: [2]},
+            {headerName: "不调价", headerWidth: 55, dataCode: "is_adjust_price", dataType: "String",cellType: "checkBox",spanRows: [2], visible: false},
             {headerName: ["调价后","市场价"], headerWidth: 75, dataCode: "tenderPrice", hAlign: "right", dataType: "Number",validator:"number",spanCols: [2,1], visible: false},
             {headerName: ["","总消耗量"], headerWidth: 90, dataCode: "tenderQuantity", hAlign: "right", dataType: "Number",decimalField:'glj.quantity',spanCols: [0,1], visible: false}
         ],