|
@@ -1154,7 +1154,7 @@ const XMLStandard = (function () {
|
|
|
tender.children.push(evalEstimateMaterial);
|
|
tender.children.push(evalEstimateMaterial);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- //清单综合单价计算程序
|
|
|
|
|
|
|
+ // 清单综合单价计算程序
|
|
|
let calcProgram = loadCalcProgram(tenderDetail);
|
|
let calcProgram = loadCalcProgram(tenderDetail);
|
|
|
if (calcProgram) {
|
|
if (calcProgram) {
|
|
|
tender.children.push(calcProgram);
|
|
tender.children.push(calcProgram);
|
|
@@ -1507,9 +1507,10 @@ const XMLStandard = (function () {
|
|
|
};
|
|
};
|
|
|
source.calcBaseState = _util.transformCalcBaseState(detail, source.calcBase, CalcStateMap);
|
|
source.calcBaseState = _util.transformCalcBaseState(detail, source.calcBase, CalcStateMap);
|
|
|
if (hasBillsClass) {
|
|
if (hasBillsClass) {
|
|
|
- _failList.push(`第${source.row}行清单应是清单分类,其下必须有清单项目。<span style="color: red">(错误清单结构)</span>`);
|
|
|
|
|
|
|
+ _failList.push(`第${source.row}行清单应是组织措施分类,其下必须有公式计算措施项。<span style="color: red">(错误清单结构)</span>`);
|
|
|
}
|
|
}
|
|
|
let formula = new FormulaCalcMeasure(source);
|
|
let formula = new FormulaCalcMeasure(source);
|
|
|
|
|
+ _util.checkUnique(curTenderEle.constraints.formulaMeasureNo, source.code, `第${source.row}行`,`公式计算措施项编码${source.code}`);
|
|
|
parent.children.push(formula);
|
|
parent.children.push(formula);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -1737,6 +1738,7 @@ const XMLStandard = (function () {
|
|
|
if (hasBillsClass) {
|
|
if (hasBillsClass) {
|
|
|
_failList.push(`第${source.row}行清单应是清单分类,其下必须有清单项目。<span style="color: red">(错误清单结构)</span>`);
|
|
_failList.push(`第${source.row}行清单应是清单分类,其下必须有清单项目。<span style="color: red">(错误清单结构)</span>`);
|
|
|
}
|
|
}
|
|
|
|
|
+ _util.checkUnique(curTenderEle.constraints.turnKeyContractCode, source.code, `第${source.row}行`, `总承包服务费费用项编码${source.code}`);
|
|
|
parent.children.push(new TurnKeyContractItem(source));
|
|
parent.children.push(new TurnKeyContractItem(source));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|