1.暂估类型新增2个类型

2.修复项目管理页面js的bug

modules/glj/models/glj_list_model.js

@@ -20,12 +20,13 @@ import MixRatioModel from "./mix_ratio_model";
 class GLJListModel extends BaseModel {
 
     /**
-     * 材料类型id
+     * 材料、主材、设备类型id
      *
      * @var {Array}
      */
     materialIdList = [GLJTypeConst.GENERAL_MATERIAL, GLJTypeConst.CONCRETE, GLJTypeConst.MORTAR, GLJTypeConst.MIX_RATIO,
-        GLJTypeConst.COMMERCIAL_CONCRETE, GLJTypeConst.COMMERCIAL_MORTAR];
+        GLJTypeConst.COMMERCIAL_CONCRETE, GLJTypeConst.COMMERCIAL_MORTAR, GLJTypeConst.MAIN_MATERIAL,
+        GLJTypeConst.EQUIPMENT];
 
     /**
      * 拥有组成物的工料机类型id
@@ -137,7 +138,6 @@ class GLJListModel extends BaseModel {
                     }
                 }
             }
-
             // 组合单价数据
             this.combineData(gljData, unitPriceList, quantityList, mixRatioData, totalComposition);
 

web/building_saas/pm/js/pm_main.js

@@ -822,9 +822,10 @@ function GetUpdateData(parent, next, name, property, newId, type) {
     let data = [];
     let updateData = {};
 
-    if(type.projectType== projectType.tender){
+    let rootProjectID = -1;
+    if(type.projectType === projectType.tender){
         let rootProject = parent ? parent.parent : Tree._root;
-        let rootProjectID = rootProject ? rootProject.id() : -1;
+        rootProjectID = rootProject ? rootProject.id() : -1;
         if(property){
             property.rootProjectID=rootProjectID;
         }