|
|
@@ -287,9 +287,9 @@ INTERFACE_EXPORT = (() => {
|
|
|
Element
|
|
|
} = INTERFACE_EXPORT_BASE;
|
|
|
|
|
|
- const {
|
|
|
+ const {
|
|
|
isGLYun
|
|
|
- } = window.commonUtil;
|
|
|
+ } = window.commonUtil;
|
|
|
|
|
|
const {
|
|
|
EXPORT_KIND: {
|
|
|
@@ -1672,6 +1672,9 @@ INTERFACE_EXPORT = (() => {
|
|
|
}
|
|
|
};
|
|
|
const _getAllGlj = function (parentBill) {
|
|
|
+ if (parentBill.data.name === '挖除水泥混凝土路面(平面交叉)') {
|
|
|
+ debugger;
|
|
|
+ }
|
|
|
if (parentBill.children.length > 0) {
|
|
|
parentBill.children.forEach((subBill) => {
|
|
|
_getAllGlj(subBill);
|
|
|
@@ -1685,9 +1688,13 @@ INTERFACE_EXPORT = (() => {
|
|
|
}
|
|
|
tenderProject.ration_glj.datas.forEach((rglj) => {
|
|
|
if (rglj.billsItemID === parentBill.data.ID) {
|
|
|
+ let ration = _getRation(rglj.rationID);
|
|
|
+ if (ration) {
|
|
|
+ // 计算消耗量,否则定额人材机消耗量取值会不正确
|
|
|
+ gljOprObj.getTotalQuantity(rglj, ration);
|
|
|
+ }
|
|
|
let gljQty = parseFloat(rglj.tenderQuantity || rglj.quantity);
|
|
|
if (isNaN(gljQty)) gljQty = 0;
|
|
|
- let ration = _getRation(rglj.rationID);
|
|
|
let gljRationQty = 0;
|
|
|
if (ration) gljRationQty = parseFloat(ration.tenderQuantity || ration.quantity);
|
|
|
if (isNaN(gljRationQty)) gljRationQty = 0;
|
|
|
@@ -1909,7 +1916,7 @@ INTERFACE_EXPORT = (() => {
|
|
|
const bNodeName = _billStrFilter(node.data.name);
|
|
|
if (bNodeName.indexOf('清单第') >= 0 && bNodeName.indexOf('00章') > 0) {
|
|
|
return 0;
|
|
|
- } else if (isFlag(node.data) && specialChkBillFlag.includes(node.data.flagsIndex.fixed.flag)){
|
|
|
+ } else if (isFlag(node.data) && specialChkBillFlag.includes(node.data.flagsIndex.fixed.flag)) {
|
|
|
return 0;
|
|
|
}
|
|
|
return 1 //叶子清单输出1
|
|
|
@@ -2714,7 +2721,7 @@ INTERFACE_EXPORT = (() => {
|
|
|
}
|
|
|
}
|
|
|
// if (_billStrFilter(bill.name).includes('第100章至700章清单')) {
|
|
|
- if (_billStrFilter(bill.name).includes('第100章至') && _billStrFilter(bill.name).includes('00章清单')) {
|
|
|
+ if (_billStrFilter(bill.name).includes('第100章至') && _billStrFilter(bill.name).includes('00章清单')) {
|
|
|
cacheObj['_{各章清单合计}'] = {};
|
|
|
cacheObj['_{各章清单合计}'].formulaCode = `{F${cnt - 1}}`;
|
|
|
} else if (!_billStrFilter(bill.name).includes('清单第100章')) {
|