|
@@ -64,6 +64,7 @@ const budgetSummaryObj = (() => {
|
|
|
if (node.data.calcBase && node.data.calcBase !== "") {
|
|
|
return cbParser.toFExpr(node.data.calcBase);
|
|
|
}
|
|
|
+ return '';
|
|
|
},
|
|
|
'feesIndex.common.unitFee': (node) => {
|
|
|
return _.get(node, 'data.feesIndex.common.unitFee', '') || '';
|
|
@@ -99,7 +100,7 @@ const budgetSummaryObj = (() => {
|
|
|
return;
|
|
|
}
|
|
|
const textFunc = textFactory[field];
|
|
|
- const val = textFunc ? textFunc(node) : node.data[field];
|
|
|
+ const val = textFunc ? textFunc(node) : node.data[field] || '';
|
|
|
sheet.setValue(row, col, val);
|
|
|
});
|
|
|
});
|
|
@@ -249,7 +250,8 @@ const budgetSummaryObj = (() => {
|
|
|
nodes.forEach(node => {
|
|
|
const orgItem = orgMap[node.data.ID];
|
|
|
if (orgItem) {
|
|
|
- Object.assign(node.data, orgItem);
|
|
|
+ node.data = _.cloneDeep(orgItem);
|
|
|
+ // Object.assign(node.data, orgItem);
|
|
|
}
|
|
|
});
|
|
|
refreshData(sheet, changedCells);
|
|
@@ -361,12 +363,13 @@ const budgetSummaryObj = (() => {
|
|
|
return 0;
|
|
|
}
|
|
|
// 工程费用区域,只读
|
|
|
- const equipmentNode = nodes.find(node => node.getFlag() === fixedFlag.CONSTRUCTION_EQUIPMENT_FEE);
|
|
|
- if (!equipmentNode) {
|
|
|
+ const constructionFeeNode = nodes.find(node => node.getFlag() === fixedFlag.CONSTRUCTION_FEE);
|
|
|
+ if (!constructionFeeNode) {
|
|
|
return 0;
|
|
|
}
|
|
|
- sheet.getRange(0, 0, equipmentNode.serialNo() + 1, budgetSummaryTreeSetting.cols.length, GC.Spread.Sheets.SheetArea.viewport).locked(true);
|
|
|
- return equipmentNode.serialNo() + 1;
|
|
|
+ const endIndex = constructionFeeNode.posterityCount() + 1;
|
|
|
+ sheet.getRange(0, 0, endIndex, budgetSummaryTreeSetting.cols.length, GC.Spread.Sheets.SheetArea.viewport).locked(true);
|
|
|
+ return endIndex;
|
|
|
}
|
|
|
if (isMass) {
|
|
|
TREE_SHEET_HELPER.massOperationSheet(sheet, () => {
|