debug

modules/pm/controllers/pm_controller.js

@@ -46,7 +46,17 @@ module.exports = {
              * userId(String): Session.userID
              */
             //result._doc.userID == userId &&
-            if (result._doc.projType === projType.tender) {
+            let isShare = false;
+            if(userId !== result.userID){
+                //判断是否是打开分享的项目
+                for(let shareData of result.shareInfo){
+                    if(shareData.userID === userId){
+                        isShare = true;
+                        break;
+                    }
+                }
+            }
+            if ((userId === result.userID || isShare) && result._doc.projType === projType.tender) {
                 callback(true);
             } else {
                 callback(false);

web/building_saas/main/js/models/calc_base.js

@@ -1351,7 +1351,7 @@ let cbParser = {
             exps.push(exp);
         }
         //去{}
-        v = v.replace(/[{, }]/g, '');
+        v = v.replace(/[{, },]/g, '');
         for(let i = 0, len = exps.length;i < len; i++){
             exps[i].compileExp = '$CBC.base(\'' + exps[i].orgExp + '\')';
             //暂估材料费作特殊处理
@@ -1487,7 +1487,7 @@ let calcBase = {
             node.changed = true;
         }
         catch (err){
-            alert(me.errMsg);
+            alert(err);
         }
     }
 };

web/building_saas/main/js/views/calc_base_view.js

@@ -135,8 +135,9 @@ let calcBaseView = {
             return true;
         }
         else{
+
             var selected = projectObj.project.mainTree.selected;
-            return MainTreeCol.readOnly.forCalcBase(selected)?false:true;
+            return selected && MainTreeCol.readOnly.forCalcBase(selected)?false:true;
         }
     },
     bindClassBtn: function () {

web/building_saas/main/js/views/fee_rate_view.js

@@ -366,7 +366,7 @@ var feeRateObject={
     },
     ifFeeRateEdit:function () {
         var selected = projectObj.project.mainTree.selected;
-        return MainTreeCol.readOnly.forFeeRate(selected)?false:true;
+        return selected&&MainTreeCol.readOnly.forFeeRate(selected)?false:true;
     },
     createSpreadView:function () {
         if (this.mainViews) {