|
@@ -1322,7 +1322,7 @@ INTERFACE_EXPORT = (() => {
|
|
|
let rst = false;
|
|
let rst = false;
|
|
|
let pNode = bNode;
|
|
let pNode = bNode;
|
|
|
while (pNode !== null && pNode !== undefined) {
|
|
while (pNode !== null && pNode !== undefined) {
|
|
|
- if ((typeof pNode.name === 'string') && exArr.includes(pNode.name)) {
|
|
|
|
|
|
|
+ if ((typeof pNode.data.name === 'string') && exArr.includes(pNode.data.name)) {
|
|
|
rst = true;
|
|
rst = true;
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
@@ -1332,11 +1332,11 @@ INTERFACE_EXPORT = (() => {
|
|
|
}
|
|
}
|
|
|
function _chkIfNeedCostComposition(bNode) {
|
|
function _chkIfNeedCostComposition(bNode) {
|
|
|
let rst = isBidInvitation && !(ProvisionalType === 0 || ProvisionalType === 1);
|
|
let rst = isBidInvitation && !(ProvisionalType === 0 || ProvisionalType === 1);
|
|
|
- if (!rst) {
|
|
|
|
|
|
|
+ if (rst) {
|
|
|
//计日工合计下的劳务、材料、机械 有费用也要输出
|
|
//计日工合计下的劳务、材料、机械 有费用也要输出
|
|
|
if (bNode.children && bNode.children.length === 0 && bNode.data.quantity) { //先检测是否有费用
|
|
if (bNode.children && bNode.children.length === 0 && bNode.data.quantity) { //先检测是否有费用
|
|
|
// 再检测是否计日工合计清单下
|
|
// 再检测是否计日工合计清单下
|
|
|
- rst = _chkIfJRGHJ(bNode, ['计日工合计']);
|
|
|
|
|
|
|
+ rst = !_chkIfJRGHJ(bNode, ['计日工合计']);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
return rst;
|
|
return rst;
|