机上人工调价。

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

@@ -359,25 +359,13 @@ let calcTools = {
         if ((priceType == priceTypes.ptDiffPrice) && (gljTypes.includes(gljType.MACHINE_LABOUR) || gljTypes.includes(gljType.FUEL_POWER_FEE))){
             for (let glj of treeNode.data.gljList) {
                 if ([gljType.GENERAL_MACHINE, gljType.INSTRUMENT].includes(glj.type)){
-/*                    if (isTender){
-                        calcTools.calcGLJTenderPrice(glj);
-                        calcTools.calcGLJTenderQty(treeNode, glj);
-                    };*/
                     let mds = projectObj.project.composition.getCompositionByGLJ(glj);
                     if (!mds) mds = [];
                     for (let md of mds){
                         if (gljTypes.includes(md.type)){
-                            let gljQ = me.uiGLJQty(glj["quantity"]);
-                            let mdMP = md["marketPrice"];
-                            if (isTender){
-                                // calcTools.calcGLJTenderPrice(md);
-                                mdMP = md["tenderPrice"];
-
-                                calcTools.calcGLJTenderQty(treeNode, glj);
-                                gljQ = me.uiGLJQty(glj["tenderQuantity"]);
-                            };
+                            let gljQ = isTender ? me.uiGLJQty(glj["tenderQuantity"]) : me.uiGLJQty(glj["quantity"]);
+                            let mdMP = isTender ? md["tenderPrice"] : md["marketPrice"];
                             let mdQ = me.uiGLJQty(md.consumption);
-
                             let mdAP = calcTools.hasAdjustPrice() ? md["adjustPrice"] : md["basePrice"];
                             // if (aprice != mprice){
                             temp = (temp + (gljQ * mdQ * mdMP).toDecimal(decimalObj.process)).toDecimal(decimalObj.process);
@@ -392,10 +380,6 @@ let calcTools = {
         else{
             for (let glj of treeNode.data.gljList) {
                     if (gljTypes.indexOf(glj.type) >= 0) {
-                    /*if (isTender){
-                        calcTools.calcGLJTenderPrice(glj);
-                        calcTools.calcGLJTenderQty(treeNode, glj);
-                    };*/
                     let qty = isTender ? me.uiGLJQty(glj["tenderQuantity"]) : me.uiGLJQty(glj["quantity"]);
                     // let mprice = isTender ? me.uiGLJPrice(glj["tenderPrice"], glj) : me.uiGLJPrice(glj["marketPrice"], glj);
                     // let aprice = calcTools.hasAdjustPrice() ? me.uiGLJPrice(glj["adjustPrice"], glj) : me.uiGLJPrice(glj["basePrice"], glj);
@@ -459,13 +443,7 @@ let calcTools = {
                 // 机型不符
                 if ((masterTypeFilter.length > 0) && (glj.model && !masterTypeFilter.includes(glj.model))) continue;
 
-                let gljQ;
-                if (isTender){
-                    calcTools.calcGLJTenderQty(treeNode, glj);
-                    gljQ = glj.tenderQuantity;
-                }
-                else
-                    gljQ = glj.quantity;
+                let gljQ = isTender ? glj.tenderQuantity : glj.quantity;
                 // 获取机械组成物(调价不深入到组成物)
                 let mds = projectObj.project.composition.getCompositionByGLJ(glj);
                 if (!mds) mds = [];
@@ -571,7 +549,6 @@ let calcTools = {
                     rst.eU = rst.eU.toDecimal(decimalObj.process);
                     // 不能直接用glj.tenderPrice，这个值不可靠。当调价界面删除单价系数后，tenderPrice没有实时计算，取得的值为0
                     rst.eTU = rst.eTU + (me.uiGLJQty(glj.tenderQuantity) * glj.tenderPrice).toDecimal(decimalObj.process);
-                    // rst.eTU = rst.eTU + (me.uiGLJQty(glj.tenderQuantity) * me.calcGLJTenderPrice(glj)).toDecimal(decimalObj.process);
                     rst.eTU = rst.eTU.toDecimal(decimalObj.process);
                 }
                 else{   // 组成物。
@@ -586,9 +563,8 @@ let calcTools = {
                         rst.eU = rst.eU.toDecimal(decimalObj.process);
 
                         // 数量只调到工料机级别，工料机下的组成物不调量（如机械、混凝土）。调价调的是工料机下的组成物的价。
-                        // let mdTU = (me.uiGLJQty(md.consumption) * me.calcGLJTenderPrice(md)).toDecimal(decimalObj.glj.unitPrice);
                         let mdTU = (me.uiGLJQty(md.consumption) * md.tenderPrice).toDecimal(decimalObj.glj.unitPrice);
-                        rst.eTU = rst.eTU + (mdTU * me.calcGLJTenderQty(treeNode, glj)).toDecimal(decimalObj.process);
+                        rst.eTU = rst.eTU + (mdTU * glj.tenderQuantity).toDecimal(decimalObj.process);
                         rst.eTU = rst.eTU.toDecimal(decimalObj.process);
                     }
                 }
@@ -797,14 +773,7 @@ let calcTools = {
 
         let sum = 0;
         for (let glj of treeNode.data.gljList){
-            let gljQ, gljP;
-            if (isTender){
-                calcTools.calcGLJTenderQty(treeNode, glj);
-                gljQ = glj.tenderQuantity;
-            }
-            else
-                gljQ = glj.quantity;
-
+            let gljQ = isTender ? glj.tenderQuantity : glj.quantity;
             gljP = isRationPirce ? glj.basePrice : glj.marketPrice;
 
             let X = 1;    // 部分甲供系数(默认1，即完全甲供)
@@ -1094,16 +1063,8 @@ let calcTools = {
         calcTools.uiNodeQty(node);
         for (let glj of node.data.gljList) {
             if (glj.type == gljType.LABOUR) {
-                let gljQ;
-                if (isTender){
-                    calcTools.calcGLJTenderQty(node, glj);
-                    gljQ = glj.tenderQuantity.toDecimal(decimalObj.glj.quantity);
-                }
-                else
-                    gljQ = glj.quantity.toDecimal(decimalObj.glj.quantity);
-
-                // rst = rst + (gljQ * calcTools.uiNodeQty(node)).toDecimal(decimalObj.process);
-                // rst = rst.toDecimal(decimalObj.process);
+                let gljQ = isTender ? glj.tenderQuantity : glj.quantity;
+                gljQ = gljQ.toDecimal(decimalObj.glj.quantity);
                 rst = (rst + gljQ).toDecimal(decimalObj.process);
             }
         };

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

@@ -18,7 +18,7 @@ let gljCol = {
             {headerName: "总消耗量", headerWidth: 80, dataCode: "totalQuantity", dataType: "Number", hAlign: "right", decimalField: "glj.quantity"},
             {headerName: "暂估", headerWidth: 45, dataCode: "isEstimate", dataType: "String", hAlign: "center", vAlign: "center", cellType: "checkBox"},
             {headerName: "调后市场价", headerWidth: 80, dataCode: "tenderPrice", dataType: "Number", hAlign: "right", visible: false},
-            {headerName: "调后消耗量", headerWidth: 80, dataCode: "tenderQuantity", dataType: "Number", hAlign: "right", visible: false}
+            {headerName: "调后消耗量", headerWidth: 80, dataCode: "tenderQuantity", dataType: "Number", hAlign: "right", decimalField: "glj.quantity", visible: false}
         ],
         view: {
             lockColumns: [ "adjustPrice", "quantity", "totalQuantity", "isEstimate",