|
@@ -1063,9 +1063,14 @@ const XMLStandard = (function () {
|
|
|
let appraisalSummary = new AppraisalSummary();
|
|
|
project.children.unshift(appraisalSummary);
|
|
|
//单项工程
|
|
|
- for (let eng of projectData.children) {
|
|
|
- let engElement = await loadEngineering(projectData.summaryInfo, eng);
|
|
|
- project.children.push(engElement);
|
|
|
+ for (const eng of projectData.children) {
|
|
|
+ if (projectData.isTwoLevel) {
|
|
|
+ const tenders = await loadEngineering(projectData.summaryInfo, eng);
|
|
|
+ project.children.push(...tenders);
|
|
|
+ } else {
|
|
|
+ const engElement = await loadEngineering(projectData.summaryInfo, eng);
|
|
|
+ project.children.push(engElement);
|
|
|
+ }
|
|
|
}
|
|
|
//主要清单汇总、评审材料汇总 排在后面
|
|
|
project.children = [...project.children.slice(2), mainBillsSummaryEle, appraisalSummary];
|
|
@@ -1089,6 +1094,7 @@ const XMLStandard = (function () {
|
|
|
}
|
|
|
/*
|
|
|
* 加载单项工程数据
|
|
|
+ * 如果导入有isTwoLevel标记(导入文件只有两层),则导出只导出两层,忽略单项工程层
|
|
|
* @param {Object}summaryInfo(项目汇总信息映射) {Object}engData(单项工程数据)
|
|
|
* */
|
|
|
async function loadEngineering(summaryInfo, engData) {
|
|
@@ -1097,6 +1103,7 @@ const XMLStandard = (function () {
|
|
|
//费用构成
|
|
|
let feeForm = new FeeFrom(summaryInfo[engData.ID]);
|
|
|
engineering.children.push(feeForm);
|
|
|
+ const tenders = [];
|
|
|
//分批次获取单位工程
|
|
|
let tenderDetailMap = _cache.getItem('tenderDetailMap');
|
|
|
for (let tenderData of engData.children) {
|
|
@@ -1113,8 +1120,9 @@ const XMLStandard = (function () {
|
|
|
}
|
|
|
tenderGljs = []; //清空单位工程内所有的人材机(ID)
|
|
|
engineering.children.push(tender);
|
|
|
+ tenders.push(tender);
|
|
|
}
|
|
|
- return engineering;
|
|
|
+ return projectData.isTwoLevel ? tenders : engineering;
|
|
|
}
|
|
|
/*
|
|
|
* 加载单位工程数据
|