|
|
@@ -380,8 +380,7 @@ let calcTools = {
|
|
|
machineDetailFee: function (treeNode, gljArr, masterTypeFilter, detailType, isTender) {
|
|
|
if (!gljArr) return 0;
|
|
|
let result = 0;
|
|
|
- // let nodeQ = isTender ? calcTools.uiNodeTenderQty(treeNode) : calcTools.uiNodeQty(treeNode);
|
|
|
- let nodeQ = 1; // 造价书→右键→插入机械:计算程序→机上人工费,多乘了机械的数量。
|
|
|
+ let nodeQ = isTender ? calcTools.uiNodeTenderQty(treeNode) : calcTools.uiNodeQty(treeNode);
|
|
|
for (let glj of gljArr) {
|
|
|
if (baseMachineMasterTypes.includes(glj.type)) {
|
|
|
// 机型不符
|
|
|
@@ -697,8 +696,11 @@ let calcTools = {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- let nodeQ = isTender ? calcTools.uiNodeTenderQty(treeNode) : calcTools.uiNodeQty(treeNode);
|
|
|
- result = (result * nodeQ).toDecimal(decimalObj.ration.totalPrice);
|
|
|
+ // 造价书→右键→插入机械:计算程序→机上人工费,多乘了机械的数量。所以这里要加个限制条件。为啥?没搞明白。
|
|
|
+ if (!isMachineLabour()) {
|
|
|
+ let nodeQ = isTender ? calcTools.uiNodeTenderQty(treeNode) : calcTools.uiNodeQty(treeNode);
|
|
|
+ result = (result * nodeQ).toDecimal(decimalObj.ration.totalPrice);
|
|
|
+ }
|
|
|
return result;
|
|
|
},
|
|
|
partASupplyFee: function (treeNode, baseName, isTender, isRationPirce = true) {
|