|
@@ -548,7 +548,7 @@ let cbTools = {
|
|
|
const allSubNodes = [];
|
|
const allSubNodes = [];
|
|
|
projectObj.project.mainTree.getAllSubNode(fixedNode, allSubNodes);
|
|
projectObj.project.mainTree.getAllSubNode(fixedNode, allSubNodes);
|
|
|
let equipmentNodes = allSubNodes.filter((node) => node.data.type === rationType.gljRation && node.data.subType === gljType.EQUIPMENT);
|
|
let equipmentNodes = allSubNodes.filter((node) => node.data.type === rationType.gljRation && node.data.subType === gljType.EQUIPMENT);
|
|
|
- if (!isLowVer("3000703")) equipmentNodes = cleanDirtyData(equipmentNodes); // 旧项目,为保证数据不变,将错就错,不过滤脏数据。
|
|
|
|
|
|
|
+ if (!isLowVer(historyVer1)) equipmentNodes = cleanDirtyData(equipmentNodes); // 旧项目,为保证数据不变,将错就错,不过滤脏数据。
|
|
|
const subFeeField = tender ? "tenderTotalFee" : "totalFee";
|
|
const subFeeField = tender ? "tenderTotalFee" : "totalFee";
|
|
|
let totalEquipmentFee = 0;
|
|
let totalEquipmentFee = 0;
|
|
|
for (const node of equipmentNodes) {
|
|
for (const node of equipmentNodes) {
|
|
@@ -837,7 +837,7 @@ let baseFigureTemplate = {
|
|
|
// {定额建安费(不含定额设备购置费)} 汇总非设备类型的定额的定额建安费
|
|
// {定额建安费(不含定额设备购置费)} 汇总非设备类型的定额的定额建安费
|
|
|
DEJAFBHDESBGZF: function (tender) {
|
|
DEJAFBHDESBGZF: function (tender) {
|
|
|
debugger;
|
|
debugger;
|
|
|
- if (isLowVer("3000703")) {
|
|
|
|
|
|
|
+ if (isLowVer(historyVer1)) {
|
|
|
const feeField = "rationCommon";
|
|
const feeField = "rationCommon";
|
|
|
const subFeeField = tender ? "tenderTotalFee" : "totalFee";
|
|
const subFeeField = tender ? "tenderTotalFee" : "totalFee";
|
|
|
let rations = projectObj.project.Ration.datas.filter((ration) => !(ration.type === rationType.gljRation && ration.subType === gljType.EQUIPMENT));
|
|
let rations = projectObj.project.Ration.datas.filter((ration) => !(ration.type === rationType.gljRation && ration.subType === gljType.EQUIPMENT));
|