|
|
@@ -1213,6 +1213,11 @@ const ImportXML = (() => {
|
|
|
addFixedBlock(fixedFlag.PROVISIONAL, tenderData.other.provisional.items, tenderData.other.provisional.fees);
|
|
|
//专业工程暂估价
|
|
|
addFixedBlock(fixedFlag.ENGINEERING_ESITIMATE, tenderData.other.engineeringPro.items, tenderData.other.engineeringPro.fees);
|
|
|
+ // 专业工程暂估价汇总金额设置为暂估价清单金额
|
|
|
+ let estimateFixedBills = billsTarget.find(d => getFlag(d) === fixedFlag.ESTIMATE);
|
|
|
+ if (estimateFixedBills) {
|
|
|
+ estimateFixedBills.fees = tenderData.other.engineeringPro.fees;
|
|
|
+ }
|
|
|
//计日工
|
|
|
addFixedBlock(fixedFlag.DAYWORK, null, tenderData.other.dayWork.fees);
|
|
|
//人工
|
|
|
@@ -1446,7 +1451,6 @@ const ImportXML = (() => {
|
|
|
});
|
|
|
});
|
|
|
// 模板映射:{[templateLibID]: data}
|
|
|
- debugger;
|
|
|
let templateMapping = await ajaxPost('/template/bills/api/getNeedfulTemplate', {allTemplateLibIDs});
|
|
|
for (let i = 0; i < xmlObj.engs.length; i++) {
|
|
|
let curEng = xmlObj.engs[i],
|
|
|
@@ -1656,7 +1660,8 @@ const ImportXML = (() => {
|
|
|
if (!bills.quantity || !ration.quantity){
|
|
|
ration.contain = '0';
|
|
|
} else {
|
|
|
- ration.contain = scMathUtil.roundForObj(ration.quantity / bills.quantity, 6);
|
|
|
+ let tempV = ration.quantity / bills.quantity;
|
|
|
+ ration.contain = isFinite(tempV) ? scMathUtil.roundForObj(tempV, 6) : '0';
|
|
|
}
|
|
|
//工程量表达式:工程量 * 单位前的量
|
|
|
/*if (!ration.unit) {
|
|
|
@@ -1670,7 +1675,6 @@ const ImportXML = (() => {
|
|
|
: ration.quantity;
|
|
|
}*/
|
|
|
// 问题
|
|
|
- debugger;
|
|
|
//处理定额人材机,添加需要的数据
|
|
|
ration.rationGljs.forEach(rGLJ => {
|
|
|
let matchGLJ = projectGLJMap[rGLJ.code];
|