|
|
@@ -394,7 +394,7 @@ const XMLStandard = (function () {
|
|
|
failHint: `第${source.row}行清单-“主要清单标志”`},
|
|
|
{name: '暂估清单标志', value: !!source.isEstimate, type: _config.TYPE.BOOL,
|
|
|
failHint: `第${source.row}行清单-“暂估清单标志”`},
|
|
|
- {name: '最高限价', value: exportKind === _config.EXPORT_KIND.Control ? source.maxPrice : '0', type: _config.TYPE.NUM2,
|
|
|
+ {name: '最高限价', value: source.maxPrice, type: _config.TYPE.NUM2,
|
|
|
failHint: `第${source.row}行清单-“最高限价”`},
|
|
|
{name: '备注', value: source.remark},
|
|
|
];
|
|
|
@@ -1202,6 +1202,13 @@ const XMLStandard = (function () {
|
|
|
let allRation = detail.Ration.datas,
|
|
|
allRationGlj = detail.ration_glj.datas,
|
|
|
decimal = detail.projectInfo.property.decimal;
|
|
|
+ // 处理最高限价，输出最高限价时，若最高限价为空，则取综合单价，否则取最高限价
|
|
|
+ let maxPrice = 0;
|
|
|
+ if (exportKind === _config.EXPORT_KIND.Control && node.data.outPutMaxPrice) {
|
|
|
+ maxPrice = _util.isDef(node.data.maxPrice)
|
|
|
+ ? node.data.maxPrice
|
|
|
+ : _util.getFee(node.data.fees, 'common.unitFee')
|
|
|
+ }
|
|
|
let source = {
|
|
|
row: detail.mainTree.nodes[detail.mainTree.prefix + node.data.ID].serialNo() + 1,
|
|
|
code: node.data.code,
|
|
|
@@ -1210,6 +1217,7 @@ const XMLStandard = (function () {
|
|
|
quantity: node.data.quantity,
|
|
|
fees: node.data.fees,
|
|
|
mainBills: node.data.mainBills,
|
|
|
+ maxPrice: maxPrice,
|
|
|
isEstimate: node.data.isEstimate,
|
|
|
remark: node.data.remark
|
|
|
};
|
