|
|
@@ -834,9 +834,11 @@ INTERFACE_EXPORT = (() => {
|
|
|
let totalItem = null;
|
|
|
let proItem = null; //暂列金额项
|
|
|
let safeItem = null;
|
|
|
+ let oneToSevenItem = null;
|
|
|
for (let b of bills) {
|
|
|
if (b.flagsIndex && b.flagsIndex.fixed && b.flagsIndex.fixed.flag == fixedFlag.TOTAL_COST) totalItem = b;
|
|
|
if (b.flagsIndex && b.flagsIndex.fixed && b.flagsIndex.fixed.flag == fixedFlag.PROVISIONAL) proItem = b;
|
|
|
+ if (b.flagsIndex && b.flagsIndex.fixed && b.flagsIndex.fixed.flag == fixedFlag.ONE_SEVEN_BILLS) oneToSevenItem = b;
|
|
|
if(b.code == "102-3" && b.name=="安全生产费") safeItem = b;
|
|
|
}
|
|
|
|
|
|
@@ -853,7 +855,7 @@ INTERFACE_EXPORT = (() => {
|
|
|
//输出招标文件时，取0
|
|
|
if (isBidInvitation) attrs[1].value = 0;
|
|
|
Element.call(this, "EprjInfo", attrs);
|
|
|
- this.children.push(new SummaryOfCost(totalItem, proItem,safeItem,feature));
|
|
|
+ this.children.push(new SummaryOfCost(totalItem, proItem,safeItem,oneToSevenItem,feature));
|
|
|
this.children.push(new MakeInfo(tenderProject));
|
|
|
this.children.push(new Params(tenderProject));
|
|
|
this.children.push(new getBillsItems(tenderProject));
|
|
|
@@ -1473,7 +1475,7 @@ INTERFACE_EXPORT = (() => {
|
|
|
Element.call(this, "Params", attrs);
|
|
|
}
|
|
|
|
|
|
- function SummaryOfCost(totalItem, proItem,safeItem,feature) {
|
|
|
+ function SummaryOfCost(totalItem, proItem,safeItem,oneToSevenItem,feature) {
|
|
|
let attrs = [{
|
|
|
name: "TenderSumLimit",
|
|
|
value: totalItem.feesIndex && totalItem.feesIndex.common && totalItem.feesIndex.common.tenderTotalFee ? totalItem.feesIndex.common.tenderTotalFee : 0,
|
|
|
@@ -1484,7 +1486,7 @@ INTERFACE_EXPORT = (() => {
|
|
|
},
|
|
|
{
|
|
|
name: "BillTotal",
|
|
|
- value: totalItem.feesIndex && totalItem.feesIndex.common && totalItem.feesIndex.common.tenderTotalFee ? totalItem.feesIndex.common.tenderTotalFee : 0,
|
|
|
+ value: oneToSevenItem.feesIndex && oneToSevenItem.feesIndex.common && oneToSevenItem.feesIndex.common.tenderTotalFee ? oneToSevenItem.feesIndex.common.tenderTotalFee : 0,
|
|
|
},
|
|
|
{
|
|
|
name: "CostForHSE",
|
