|
@@ -125,10 +125,13 @@ INTERFACE_IMPORT = (() => {
|
|
|
}
|
|
}
|
|
|
bill.calcFlag = 1;
|
|
bill.calcFlag = 1;
|
|
|
}
|
|
}
|
|
|
- if (bill.name == '投标报价') {
|
|
|
|
|
- let formula = getValue(i, ['CostComposition', 'Formula', '_Formulas']);
|
|
|
|
|
- bill.exCalcStr = formula || '';
|
|
|
|
|
|
|
+ let formula = getValue(i, ['CostComposition', 'Formula', '_Formulas']);
|
|
|
|
|
+ if (formula !== undefined && formula !== null && formula !== '') {
|
|
|
|
|
+ bill.exCalcStr = formula; // 不仅仅'投标报价'有，其他的也要
|
|
|
}
|
|
}
|
|
|
|
|
+ // if (bill.name == '投标报价') {
|
|
|
|
|
+ // bill.exCalcStr = formula || '';
|
|
|
|
|
+ // }
|
|
|
tender.bills.push(bill);
|
|
tender.bills.push(bill);
|
|
|
}
|
|
}
|
|
|
// 山东的 formula 还得调整
|
|
// 山东的 formula 还得调整
|
