|
|
@@ -466,19 +466,19 @@ let calcTools = {
|
|
|
|
|
|
let rcj = (treeNode.data.subType === gljType.LABOUR && calcTools.inBase(baseName, 'RGF')) ||
|
|
|
(baseMaterialTypes.includes(treeNode.data.subType) && calcTools.inBase(baseName, 'CLF')) ||
|
|
|
- (treeNode.data.subType === gljType.GENERAL_MACHINE && calcTools.inBase(baseName, 'JXF'));
|
|
|
-
|
|
|
- if (typeof isJX2017 != 'undefined') {
|
|
|
- rcj = rcj || (treeNode.data.subType === gljType.LABOUR && calcTools.inBase(baseName, 'SC_RGF')) ||
|
|
|
- (baseMaterialTypes.includes(treeNode.data.subType) && calcTools.inBase(baseName, 'SC_CLF')) ||
|
|
|
- (treeNode.data.subType === gljType.GENERAL_MACHINE && calcTools.inBase(baseName, 'SC_JXF'))
|
|
|
- };
|
|
|
+ (treeNode.data.subType === gljType.GENERAL_MACHINE && calcTools.inBase(baseName, 'JXF')) ||
|
|
|
+ (treeNode.data.subType === gljType.LABOUR && calcTools.inBase(baseName, 'SC_RGF')) ||
|
|
|
+ (baseMaterialTypes.includes(treeNode.data.subType) && calcTools.inBase(baseName, 'SC_CLF')) ||
|
|
|
+ (treeNode.data.subType === gljType.GENERAL_MACHINE && calcTools.inBase(baseName, 'SC_JXF'));
|
|
|
|
|
|
if (rcj ||
|
|
|
(treeNode.data.subType === gljType.MAIN_MATERIAL && calcTools.inBase(baseName, 'ZCF')) ||
|
|
|
(treeNode.data.subType === gljType.EQUIPMENT && calcTools.inBase(baseName, 'SBF'))) {
|
|
|
- if (treeNode.data.type == rationType.volumePrice)
|
|
|
- result = treeNode.data.marketUnitFee ? parseFloat(treeNode.data.marketUnitFee).toDecimal(decimalObj.ration.unitPrice) : 0
|
|
|
+ if (treeNode.data.type == rationType.volumePrice){
|
|
|
+ let nodeQ = calcTools.uiNodeQty(treeNode) ? calcTools.uiNodeQty(treeNode) : 0;
|
|
|
+ result = treeNode.data.marketUnitFee ? (parseFloat(treeNode.data.marketUnitFee) * nodeQ).toDecimal(decimalObj.ration.unitPrice) : 0
|
|
|
+ }
|
|
|
+
|
|
|
else if (treeNode.data.type == rationType.gljRation)
|
|
|
// result = treeNode.data.basePrice ? parseFloat(treeNode.data.basePrice).toDecimal(decimalObj.ration.unitPrice) : 0;
|
|
|
// 这里因为是算基数所以要取基价，但不能直接取basePrice，受限于项目属性的三个选项。
|
|
|
@@ -824,17 +824,18 @@ let rationCalcBasesNameKinds = {
|
|
|
RGF: ['定额基价人工费', '定额人工费'],
|
|
|
CLF: ['定额基价材料费', '定额材料费'],
|
|
|
QTCLF: ['定额其他材料费'],
|
|
|
- JXF: ['定额基价机械费', '定额机械费', '定额施工机具使用费'],
|
|
|
- JSRGF: ['定额基价机上人工费'],
|
|
|
+ JXF: ['定额基价机械费', '定额机械费', '定额施工机具使用费', '定额施工机械使用费'],
|
|
|
+ JSRGF: ['定额基价机上人工费', '定额施工机械人工费'],
|
|
|
ZCF: ['主材费', '市场价主材费'],
|
|
|
- SBF: ['设备费'],
|
|
|
+ SBF: ['设备费', '市场价设备费'],
|
|
|
RGGR: ['人工工日'],
|
|
|
ZGCLF: ['暂估材料费'],
|
|
|
|
|
|
// 市场价人工费、市场价材料费、市场价机械费。江西用，跟重庆区分开，概念上不太统一，这里要注意区分。
|
|
|
SC_RGF: ['人工费'],
|
|
|
SC_CLF: ['材料费'],
|
|
|
- SC_JXF: ['机械费'],
|
|
|
+ SC_JXF: ['机械费', '施工机具使用费', '施工机械使用费'],
|
|
|
+ SC_JSRGF: ['施工机械人工费'],
|
|
|
|
|
|
JC_RGF: ['人工费价差'],
|
|
|
JC_CLF: ['材料费价差'],
|
