bug

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

@@ -707,10 +707,14 @@ let calcTools = {
         glj.tenderQuantity = (glj.quantity * qCoe).toDecimal(decimalObj.glj.quantity);
     },
     calcGLJTenderPrice: function (glj) {
-        let pCoe = 1;
-        if (projectObj.project.property.tenderSetting && projectObj.project.property.tenderSetting.gljPriceTenderCoe)
-            pCoe = projectObj.project.property.tenderSetting.gljPriceTenderCoe;
-        glj.tenderPrice = (glj.marketPrice * pCoe).toDecimal(decimalObj.glj.unitPrice);
+        // let pCoe = 1;
+        // if (projectObj.project.property.tenderSetting && projectObj.project.property.tenderSetting.gljPriceTenderCoe)
+        //     pCoe = projectObj.project.property.tenderSetting.gljPriceTenderCoe;
+        // if (compositionTypes.indexOf(glj.type) >= 0)
+        //
+        // else
+        //     glj.tenderPrice = (glj.marketPrice * pCoe).toDecimal(decimalObj.glj.unitPrice);
+        glj.tenderPrice = projectObj.project.projectGLJ.getTenderMarketPrice(projectObj.project.projectGLJ.getDataByID(glj.projectGLJID));
     },
     // 界面显示的工料机价格，包括定额价、市场价等。参数 price 传入一个普通的价格数值即可。
     uiGLJPrice: function (price){
@@ -1906,9 +1910,11 @@ class CalcProgram {
 
     // 反向调价
     calcTenderReverse(treeNode, tender){
-        if (treeNode.data.feesIndex.common.tenderUnitFee != treeNode.data.feesIndex.common.unitFee){
-            treeNode.data.feesIndex.common.tenderUnitFee = treeNode.data.feesIndex.common.unitFee;
-            treeNode.changed = true;
+        if (tender == tenderTypes.ttReverseRation) {
+            if (treeNode.data.feesIndex.common.tenderUnitFee != treeNode.data.feesIndex.common.unitFee) {
+                treeNode.data.feesIndex.common.tenderUnitFee = treeNode.data.feesIndex.common.unitFee;
+                treeNode.changed = true;
+            }
         };
 
         if (!treeNode.data.targetTotalFee){
@@ -1921,9 +1927,12 @@ class CalcProgram {
             }
         };
 
+        if (!treeNode.data.targetUnitFee)
+            treeNode.data.targetUnitFee = (treeNode.data.targetTotalFee / treeNode.data.quantity).toDecimal(decimalObj.decimal('unitPrice', treeNode));
         let coe = 1;
         if (treeNode.data.feesIndex.common.totalFee != 0)
-            coe = (treeNode.data.targetTotalFee / treeNode.data.feesIndex.common.totalFee).toDecimal(2);//(decimalObj.process);
+            // coe = (treeNode.data.targetTotalFee / treeNode.data.feesIndex.common.totalFee).toDecimal(decimalObj.process);
+            coe = (treeNode.data.targetUnitFee / treeNode.data.feesIndex.common.unitFee).toDecimal(decimalObj.process);
 
         if (tender == tenderTypes.ttReverseRation){
             treeNode.data.tenderQuantity = (treeNode.data.quantity * coe).toDecimal(decimalObj.decimal("quantity", treeNode));

web/building_saas/main/js/models/main_consts.js

@@ -73,7 +73,7 @@ const allMaterialTypes = [
     gljType.MAIN_MATERIAL,
     gljType.EQUIPMENT
 ];
-// 会有组成物的材料
+// 会有组成物的材料、机械台班
 const compositionTypes = [
     gljType.MAIN_MATERIAL,
     gljType.CONCRETE,