Merge branch 'master' of http://192.168.1.41:3000/SmartCost/ConstructionCost

modules/pm/facade/pm_facade.js

@@ -2172,6 +2172,10 @@ async function importProject(importObj, userID, compilationID, overWriteUrl) {
             });
         }
         data.property.projectFeature = featureLib ? featureLib.feature : [];
+        // 累进数据
+        if (data.property.progressiveLibID) {
+            data.property.progressiveInterval = await getProgressiveInterval(data.property.progressiveLibID);
+        }
         // 指标信息相关设置
         await project_facade.setSEILibData(data.property);
     }

web/building_saas/pm/js/pm_import.js

@@ -268,6 +268,7 @@ const importView = (() => {
             economicLibID: curEngineering.lib.economic_lib[0] ? curEngineering.lib.economic_lib[0].id : '',    // 主要经济指标
             mainQuantityLibID: curEngineering.lib.main_quantity_lib[0] ? curEngineering.lib.main_quantity_lib[0].id : '',   // 主要工程量指标
             materialLibID: curEngineering.lib.material_lib[0] ? curEngineering.lib.material_lib[0].id : '', // 主要工料指标
+            progressiveLibID: curEngineering.lib.progressive_lib[0] ? curEngineering.lib.progressive_lib[0].id: '', // 累进库
             calcProgram: { name: taxData.program_lib.name, id: taxData.program_lib.id },  //计算程序
             colLibID: taxData.col_lib.id,   //列设置
             templateLibID: taxData.template_lib.id, //清单模板