|
|
@@ -1301,7 +1301,8 @@ INTERFACE_EXPORT = (() => {
|
|
|
{name: 'Name', value: glj.name},
|
|
|
{name: 'Unit', value: glj.unit},
|
|
|
{name: 'Num', value: glj.tenderQuantity},
|
|
|
- {name: 'Price', value: _getNumValueByExportKind(glj.unit_price.market_price)},
|
|
|
+ // {name: 'Price', value: _getNumValueByExportKind(glj.unit_price.market_price)},
|
|
|
+ {name: 'Price', value: glj.unit_price.market_price}, //暂估材料输出price，不需判断导出类型
|
|
|
{name: 'Sum', value: _getNumValueByExportKind(scMathUtil.roundForObj(glj.tenderQuantity * glj.unit_price.market_price, 0)), type:TYPE.DECIMAL},
|
|
|
// {name: 'Price', value: 0},
|
|
|
// {name: 'Sum', value: 0},
|
|
|
@@ -1367,7 +1368,8 @@ INTERFACE_EXPORT = (() => {
|
|
|
{name: 'Name', value: glj.name},
|
|
|
{name: 'Unit', value: glj.unit},
|
|
|
{name: 'Num', value: glj.tenderQuantity},
|
|
|
- {name: 'Price', value: _getNumValueByExportKind(glj.unit_price.market_price)},
|
|
|
+ // {name: 'Price', value: _getNumValueByExportKind(glj.unit_price.market_price)},
|
|
|
+ {name: 'Price', value: glj.unit_price.market_price}, // 暂估设备直接输出price
|
|
|
{name: 'Sum', value: _getNumValueByExportKind(scMathUtil.roundForObj(glj.tenderQuantity * glj.unit_price.market_price, 0)), type:TYPE.DECIMAL},
|
|
|
// {name: 'Price', value: 0},
|
|
|
// {name: 'Sum', value: 0},
|
|
|
@@ -1406,7 +1408,8 @@ INTERFACE_EXPORT = (() => {
|
|
|
{name: 'Number', value: bill.code},
|
|
|
{name: 'Name', value: bill.name},
|
|
|
{name: 'Content', value: bill.jobContent.toString()},
|
|
|
- {name: 'Sum', value: _getNumValueByExportKind(scMathUtil.roundForObj(ttl, 0)), type:TYPE.DECIMAL},
|
|
|
+ // {name: 'Sum', value: _getNumValueByExportKind(scMathUtil.roundForObj(ttl, 0)), type:TYPE.DECIMAL},
|
|
|
+ {name: 'Sum', value: ttl, type:TYPE.DECIMAL},
|
|
|
// {name: 'Sum', value: 0, type:TYPE.DECIMAL},
|
|
|
];
|
|
|
mEstItemNode.attrs.push(...attrs);
|
|
|
@@ -1953,7 +1956,7 @@ INTERFACE_EXPORT = (() => {
|
|
|
];
|
|
|
//投标、招标控制价时。取单价。
|
|
|
//招标时，如果是“安全生产费”或“暂列金额”，取单价，否则取0。
|
|
|
- if (isBidSubmission || isControl || CostKind==1 ||CostKind==2) {
|
|
|
+ if (isBidSubmission || isControl || CostKind==1 ||CostKind==2 || ProvisionalType === 2) {
|
|
|
attrs[5].value = data.feesIndex && data.feesIndex.common ? data.feesIndex.common.tenderUnitFee : "";
|
|
|
attrs[7].value = data.feesIndex && data.feesIndex.common ? data.feesIndex.common.tenderTotalFee : "";
|
|
|
//暂列金额 数量为0的时候，单价输出0
|
