|
|
@@ -1892,6 +1892,7 @@ INTERFACE_EXPORT = (() => {
|
|
|
function bill(bNode, level) {
|
|
|
let data = bNode.data;
|
|
|
let CostKind = 3;
|
|
|
+ if (data.name === undefined || data.name === null) data.name = '';
|
|
|
if (data.name && data.name.indexOf("安全生产费") != -1) CostKind = 1;
|
|
|
if (data.name && data.name.indexOf("暂列金额") != -1) CostKind = 2;
|
|
|
//1 = 工程量×综合单价;2 = 计算基数×费率;3 = 工程量×单价。
|
|
|
@@ -2666,7 +2667,7 @@ INTERFACE_EXPORT = (() => {
|
|
|
bIdArr.push(bId);
|
|
|
if (cacheForFormula['_' + bId]) {
|
|
|
if (cacheForFormula['_' + bId].hasOwnProperty('formulaCode')) {
|
|
|
- replaceArr.push(cacheForFormula['_' + bId].formulaCode);
|
|
|
+ replaceArr.push(`{${cacheForFormula['_' + bId].formulaCode}}`);
|
|
|
} else {
|
|
|
replaceArr.push(`{无formulaCode错误:${bId}}`);
|
|
|
}
|