|
@@ -115,8 +115,10 @@ INTERFACE_IMPORT = (() => {
|
|
|
{ key: 'laneLength', value: getValue(Params, ['_LaneLength']) },// --todo
|
|
{ key: 'laneLength', value: getValue(Params, ['_LaneLength']) },// --todo
|
|
|
]
|
|
]
|
|
|
const items = arrayValue(EprjInfo, ['Items', 'Item']);
|
|
const items = arrayValue(EprjInfo, ['Items', 'Item']);
|
|
|
|
|
+ let hasOneHundredChapter = false;
|
|
|
for (let i of items) {
|
|
for (let i of items) {
|
|
|
let bill = setupBills(i);
|
|
let bill = setupBills(i);
|
|
|
|
|
+ if (bill.name.indexOf('第100章') >= 0 && bill.name.indexOf('总则') >= 0) hasOneHundredChapter = true;
|
|
|
if (bill.name == "暂列金额(不含计日工总额)") {
|
|
if (bill.name == "暂列金额(不含计日工总额)") {
|
|
|
bill.fees = [{ fieldName: "common",tenderTotalFee:ProvisionalSums, tenderUnitFee: "0", totalFee: ProvisionalSums, unitFee: "0" }];
|
|
bill.fees = [{ fieldName: "common",tenderTotalFee:ProvisionalSums, tenderUnitFee: "0", totalFee: ProvisionalSums, unitFee: "0" }];
|
|
|
if (bill.calcBase === undefined || bill.calcBase === null || bill.calcBase === '') {
|
|
if (bill.calcBase === undefined || bill.calcBase === null || bill.calcBase === '') {
|
|
@@ -134,6 +136,7 @@ INTERFACE_IMPORT = (() => {
|
|
|
// }
|
|
// }
|
|
|
tender.bills.push(bill);
|
|
tender.bills.push(bill);
|
|
|
}
|
|
}
|
|
|
|
|
+ tender.hasOneHundredChapter = hasOneHundredChapter;
|
|
|
// 山东的 formula 还得调整
|
|
// 山东的 formula 还得调整
|
|
|
// setupFormula(tender.bills);
|
|
// setupFormula(tender.bills);
|
|
|
|
|
|
|
@@ -295,6 +298,16 @@ INTERFACE_IMPORT = (() => {
|
|
|
}
|
|
}
|
|
|
importData.tenders.forEach((tender, index) => {
|
|
importData.tenders.forEach((tender, index) => {
|
|
|
setupFormula(tender.bills);
|
|
setupFormula(tender.bills);
|
|
|
|
|
+ if (!tender.hasOneHundredChapter) {
|
|
|
|
|
+ for (let idx = tender.bills.length - 1; idx >= 0; idx--) {
|
|
|
|
|
+ const bName = tender.bills[idx].name || '';
|
|
|
|
|
+ if (bName.indexOf('第100章') >= 0 && bName.indexOf('总则') > 0) {
|
|
|
|
|
+ tender.bills.splice(idx, 1);
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ delete tender.hasOneHundredChapter;
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
|
|
|