|
|
@@ -528,13 +528,18 @@ let calcTools = {
|
|
|
}
|
|
|
else if (treeNode.data.type == rationType.gljRation){
|
|
|
let prc = 0;
|
|
|
- if (treeNode.data.subType === gljType.EQUIPMENT && calcTools.inBase(baseName, 'SC_SBF'))
|
|
|
- prc = gljOprObj.getMarketPrice(treeNode)
|
|
|
+ // if (treeNode.data.subType === gljType.EQUIPMENT && calcTools.inBase(baseName, 'SC_SBF'))
|
|
|
+ // prc = gljOprObj.getMarketPrice(treeNode)
|
|
|
+ // else
|
|
|
+ // prc = gljOprObj.getBasePrice(treeNode);
|
|
|
+
|
|
|
+ if (baseName.includes('定额'))
|
|
|
+ prc = gljOprObj.getBasePrice(treeNode)
|
|
|
else
|
|
|
- prc = gljOprObj.getBasePrice(treeNode);
|
|
|
+ prc = treeNode.data.marketUnitFee ? parseFloat(treeNode.data.marketUnitFee).toDecimal(decimalObj.ration.unitPrice) : gljOprObj.getBasePrice(treeNode);
|
|
|
|
|
|
result = (prc * nodeQ).toDecimal(decimalObj.ration.unitPrice);
|
|
|
- }
|
|
|
+ };
|
|
|
|
|
|
}
|
|
|
else if (treeNode.data.subType === gljType.GENERAL_MACHINE && calcTools.inBase(baseName, 'JSRGF')) {
|