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

web/building_saas/main/js/views/tender_price_view.js

@@ -419,7 +419,7 @@ let tender_obj={
         // 量价类，工料机消耗量调整系数不允许输入
         let treeNode = me.tenderTree.items[row];
         if (calcTools.isVolumePrice(treeNode) || calcTools.isGljRation(treeNode)){
-            if ([11,12,13,14,15].includes(col))
+            if ([10,11,12,13,14].includes(col))
                 return false;
         };
         return true;

web/building_saas/pm/js/pm_import.js

@@ -261,14 +261,14 @@ const importView = (() => {
             feeStandardName: curEngineering.lib.feeName,    //费用标准
             engineering: curEngineering.lib.engineering,    //定额取费专业
             projectEngineering: curEngineering.lib.projectEngineering,  //单位工程取费专业
-            featureLibID: curEngineering.lib.feature_lib[0] ? curEngineering.lib.feature_lib[0].id : '',    //工程特征
+            featureLibID: curEngineering.lib.feature_lib && curEngineering.lib.feature_lib[0] ? curEngineering.lib.feature_lib[0].id : '',    //工程特征
             indexName: curEngineering.lib.indexName,    // 指标名称
-            engineerInfoLibID: curEngineering.lib.engineer_info_lib[0] ? curEngineering.lib.engineer_info_lib[0].id : '',   // 工程信息指标
-            engineerFeatureLibID: curEngineering.lib.engineer_feature_lib[0] ? curEngineering.lib.engineer_feature_lib[0].id : '',  //工程特征指标
-            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: '', // 累进库
+            engineerInfoLibID: curEngineering.lib.engineer_info_lib && curEngineering.lib.engineer_info_lib[0] ? curEngineering.lib.engineer_info_lib[0].id : '',   // 工程信息指标
+            engineerFeatureLibID: curEngineering.lib.engineer_feature_lib && curEngineering.lib.engineer_feature_lib[0] ? curEngineering.lib.engineer_feature_lib[0].id : '',  //工程特征指标
+            economicLibID: curEngineering.lib.economic_lib && curEngineering.lib.economic_lib[0] ? curEngineering.lib.economic_lib[0].id : '',    // 主要经济指标
+            mainQuantityLibID: curEngineering.lib.main_quantity_lib && curEngineering.lib.main_quantity_lib[0] ? curEngineering.lib.main_quantity_lib[0].id : '',   // 主要工程量指标
+            materialLibID: curEngineering.lib.material_lib && curEngineering.lib.material_lib[0] ? curEngineering.lib.material_lib[0].id : '', // 主要工料指标
+            progressiveLibID: curEngineering.lib.progressive_lib && 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, //清单模板