|
@@ -1434,6 +1434,16 @@ const XMLStandard = (function () {
|
|
|
return rationData.quantityEXP;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ function getRationGlj(ration,allRationGlj) {
|
|
|
+ if(ration.type == 3){//如果是工料机类型的定额,要组装一份需拟的定额工料机数据
|
|
|
+ return [{code:ration.code,quantity:1,totalQuantity:ration.quantity}];
|
|
|
+ }else{
|
|
|
+ let rationGlj = allRationGlj.filter(x => x.rationID === ration.ID);
|
|
|
+ return rationGlj
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
/*
|
|
|
* 加载定额子目
|
|
|
* @param {Array}rationData(清单项目下定额数据) {Array}rationGljData(定额的人材机数据) {Object}decimal(项目小数位数)
|
|
@@ -1514,7 +1524,7 @@ const XMLStandard = (function () {
|
|
|
//加载定额子目
|
|
|
rationData.sort((x, y) => x.serialNo - y.serialNo); //定额排序
|
|
|
for (let rData of rationData) {
|
|
|
- let rationGlj = allRationGlj.filter(x => x.rationID === rData.ID);
|
|
|
+ let rationGlj = getRationGlj(rData,allRationGlj);
|
|
|
priceContent.children.push(loadRation(rData, rationGlj));
|
|
|
}
|
|
|
}
|