bugs.

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

@@ -489,7 +489,9 @@ let calcTools = {
             (treeNode.data.type == rationType.gljRation) &&
             ((treeNode.data.subType === gljType.LABOUR && baseName === calcBaseNames.RGFJC) ||
                 (baseMaterialTypes.includes(treeNode.data.subType) && baseName === calcBaseNames.CLFJC) ||
-                (treeNode.data.subType === gljType.GENERAL_MACHINE && baseName === calcBaseNames.JXFJC))
+                (treeNode.data.subType === gljType.GENERAL_MACHINE && baseName === calcBaseNames.JXFJC) ||
+                (treeNode.data.subType === gljType.MAIN_MATERIAL && baseName === calcBaseNames.ZCFJC) ||
+                (treeNode.data.subType === gljType.EQUIPMENT && baseName === calcBaseNames.SBFJC))
         ) {
             let aprice = me.uiGLJPrice(treeNode.data.adjustPrice);
             let mprice = me.uiGLJPrice(treeNode.data.marketUnitFee);
@@ -778,6 +780,8 @@ const calcBaseNames = {
     RGFJC: '人工费价差',
     CLFJC: '材料费价差',
     JXFJC: '机械费价差',
+    ZCFJC: '主材费价差',
+    SBFJC: '设备费价差',
     ZCF: '主材费',
     SBF: '设备费',
     RGGR: '人工工日',
@@ -822,11 +826,17 @@ const rationCalcBases = {
     '机械费价差': function (node, isTender) {
         return calcTools.rationBaseFee(node, [gljType.GENERAL_MACHINE], priceTypes.ptDiffPrice, isTender);
     },
+    '主材费价差': function (node, isTender) {
+        return calcTools.rationBaseFee(node, [gljType.MAIN_MATERIAL], priceTypes.ptDiffPrice, isTender);
+    },
+    '设备费价差': function (node, isTender) {
+        return calcTools.rationBaseFee(node, [gljType.EQUIPMENT], priceTypes.ptDiffPrice, isTender);
+    },
     '主材费': function (node, isTender) {
-        return calcTools.rationBaseFee(node, [gljType.MAIN_MATERIAL], priceTypes.ptMarketPrice, isTender);
+        return calcTools.rationBaseFee(node, [gljType.MAIN_MATERIAL], priceTypes.ptBasePrice, isTender);
     },
     '设备费': function (node, isTender) {
-        return calcTools.rationBaseFee(node, [gljType.EQUIPMENT], priceTypes.ptMarketPrice, isTender);
+        return calcTools.rationBaseFee(node, [gljType.EQUIPMENT], priceTypes.ptBasePrice, isTender);
     },
     '人工工日': function (node, isTender) {
         if (!node.data.gljList) return 0;

web/building_saas/main/js/models/ration_glj.js

@@ -121,7 +121,8 @@ var ration_glj = {
                     glj.type = glj.subType;
                 };
 
-                glj.quantity = (glj.quantity / billQuantity).toDecimal(decimalObj.glj.quantity);
+                // glj.quantity = (glj.quantity / billQuantity).toDecimal(decimalObj.glj.quantity);
+                glj.quantity = (glj.quantity / billQuantity).toDecimal(decimalObj.process);  // 广联达这里没有取舍
             };
             return oneBill;
         }