Bläddra i källkod

清单算法2情况下,反算,输入子目系数,合价不正确。

chenshilong 6 år sedan
förälder
incheckning
e6b82e64bc

+ 8 - 4
web/building_saas/main/js/models/calc_program.js

@@ -384,7 +384,7 @@ let calcTools = {
         // 普通基数计算(包括普通价差)
         // 普通基数计算(包括普通价差)
         else{
         else{
             for (let glj of treeNode.data.gljList) {
             for (let glj of treeNode.data.gljList) {
-                if (gljTypes.indexOf(glj.type) >= 0) {
+                    if (gljTypes.indexOf(glj.type) >= 0) {
                     if (isTender){
                     if (isTender){
                         calcTools.calcGLJTenderPrice(glj);
                         calcTools.calcGLJTenderPrice(glj);
                         calcTools.calcGLJTenderQty(treeNode, glj);
                         calcTools.calcGLJTenderQty(treeNode, glj);
@@ -829,9 +829,13 @@ let calcTools = {
         return this.calcNodeTenderQty(treeNode);
         return this.calcNodeTenderQty(treeNode);
     },
     },
     calcNodeTenderQty: function (treeNode){
     calcNodeTenderQty: function (treeNode){
-        let qCoe = (treeNode.data.rationQuantityCoe == undefined) ? 1 : treeNode.data.rationQuantityCoe;
-        treeNode.data.tenderQuantity = (this.uiNodeQty(treeNode) * qCoe).toDecimal(decimalObj.decimal("quantity", treeNode));
-        return treeNode.data.tenderQuantity;
+        if (this.isBill(treeNode))                 // 清单只有一个工程量,没有调整后工程量。
+            return this.uiNodeQty(treeNode)
+        else{
+            let qCoe = (treeNode.data.rationQuantityCoe == undefined || treeNode.data.rationQuantityCoe == 0) ? 1 : treeNode.data.rationQuantityCoe;
+            treeNode.data.tenderQuantity = (this.uiNodeQty(treeNode) * qCoe).toDecimal(decimalObj.decimal("quantity", treeNode));
+            return treeNode.data.tenderQuantity;
+        }
     },
     },
     calcGLJTenderQty: function (treeNode, glj){
     calcGLJTenderQty: function (treeNode, glj){
         if (treeNode.data.quantityCoe == undefined){
         if (treeNode.data.quantityCoe == undefined){

+ 3 - 2
web/building_saas/main/js/views/tender_price_view.js

@@ -14,7 +14,7 @@ let tender_obj={
             {headerName: "项目名称", headerWidth: 200, dataCode: "name",showHint:true, hAlign: "left", dataType: "String",spanRows: [2]},
             {headerName: "项目名称", headerWidth: 200, dataCode: "name",showHint:true, hAlign: "left", dataType: "String",spanRows: [2]},
             {headerName: "计量\n单位", headerWidth: 60, dataCode: "unit", hAlign: "center", dataType: "String",spanRows: [2]},
             {headerName: "计量\n单位", headerWidth: 60, dataCode: "unit", hAlign: "center", dataType: "String",spanRows: [2]},
             {headerName: "工程量", headerWidth: 70, dataCode: "quantity", hAlign: "right", dataType: "Number",validator:"number",spanRows: [2],getText:'getText.quantity'},
             {headerName: "工程量", headerWidth: 70, dataCode: "quantity", hAlign: "right", dataType: "Number",validator:"number",spanRows: [2],getText:'getText.quantity'},
-            {headerName: "不调价", headerWidth: 55, dataCode: "is_adjust_price", hAlign: "center", cellType : "checkBox",dataType: "Number",spanRows: [2]},
+            // {headerName: "不调价", headerWidth: 55, dataCode: "is_adjust_price", hAlign: "center", cellType : "checkBox",dataType: "Number",spanRows: [2]},
             {headerName: ["初始报价","综合单价"], headerWidth: 80, dataCode: "feesIndex.common.unitFee", hAlign: "right", dataType: "Number",validator:"number",spanCols : [2,1]},
             {headerName: ["初始报价","综合单价"], headerWidth: 80, dataCode: "feesIndex.common.unitFee", hAlign: "right", dataType: "Number",validator:"number",spanCols : [2,1]},
             {headerName: ["","综合合价"], headerWidth: 80, dataCode: "feesIndex.common.totalFee", hAlign: "right", dataType: "Number",validator:"number",spanCols : [0,1]},
             {headerName: ["","综合合价"], headerWidth: 80, dataCode: "feesIndex.common.totalFee", hAlign: "right", dataType: "Number",validator:"number",spanCols : [0,1]},
             {headerName: ["目标造价","综合单价"], headerWidth: 80, dataCode: "targetUnitFee", hAlign: "right", dataType: "Number",validator:"number",spanCols : [2,1]},
             {headerName: ["目标造价","综合单价"], headerWidth: 80, dataCode: "targetUnitFee", hAlign: "right", dataType: "Number",validator:"number",spanCols : [2,1]},
@@ -29,7 +29,8 @@ let tender_obj={
             {headerName: "子目工程量\n调整系数", headerWidth: 80, dataCode: "rationQuantityCoe", hAlign: "right", dataType: "Number",spanRows: [2],validator:"number"}
             {headerName: "子目工程量\n调整系数", headerWidth: 80, dataCode: "rationQuantityCoe", hAlign: "right", dataType: "Number",spanRows: [2],validator:"number"}
         ],
         ],
         view: {
         view: {
-            lockColumns: [0,1,2,3,4,6,7,10,11]
+            // lockColumns: [0,1,2,3,4,6,7,10,11]
+            lockColumns: [0,1,2,3,4,5,6,9,10]
         }
         }
     },
     },
     tenderTreeSetting:{
     tenderTreeSetting:{