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

modules/glj/models/glj_list_model.js

@@ -318,13 +318,21 @@ class GLJListModel extends BaseModel {
             }
             let condition={
                 code: data.code,
-                project_id: data.project_id,
-                name:data.name,
+                project_id: data.project_id
+               /*  name:data.name,
                 specs:data.specs,
                 type:data.type,
-                unit:data.unit
+                unit:data.unit */
             };
-            let projectGljData = await this.findDataByCondition(condition);
+            let projectGljData = null;
+            let pList = await this.findDataByCondition(condition,null,false);
+            //规格 型号 null undefind "" 问题
+            for(let p of pList){
+                if(this.getIndex(data) == this.getIndex(p)){
+                  projectGljData = p;
+                  break;
+                }
+            }
             let isAddProjectGLJ = false;
 
             // 获取标段对应的单价文件id

web/building_saas/pm/js/pm_newMain.js

@@ -851,6 +851,7 @@ const projTreeObj = {
             return lineNum * defaultHeight;
         };
         TreeNodeCellType.prototype.paint = function (ctx, value, x, y, w, h, style, options) {
+            if(style.backColor == undefined) style.backColor = "white"
             if (style.backColor) {
                 ctx.save();
                 ctx.fillStyle = style.backColor;