|
@@ -813,6 +813,10 @@ let calcTools = {
|
|
|
return baseName.includes("定额") || baseName.includes("指标")
|
|
return baseName.includes("定额") || baseName.includes("指标")
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ function isMachineLabour() {
|
|
|
|
|
+ return baseName.includes("机上人工") || baseName.includes("机械人工")
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
if (
|
|
if (
|
|
|
baseName.includes("甲供") ||
|
|
baseName.includes("甲供") ||
|
|
|
baseName.includes("甲定") ||
|
|
baseName.includes("甲定") ||
|
|
@@ -827,7 +831,7 @@ let calcTools = {
|
|
|
result = (mprice - aprice).toDecimal(decimalObj.ration.unitPrice);
|
|
result = (mprice - aprice).toDecimal(decimalObj.ration.unitPrice);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- } else if (baseName.includes("机上人工")) {
|
|
|
|
|
|
|
+ } else if (isMachineLabour()) {
|
|
|
if (treeNode.data.subType === gljType.GENERAL_MACHINE) {
|
|
if (treeNode.data.subType === gljType.GENERAL_MACHINE) {
|
|
|
let glj = {
|
|
let glj = {
|
|
|
code: treeNode.data.code,
|
|
code: treeNode.data.code,
|