bug fixed

web/building_saas/glj/js/project_glj.js

@@ -373,7 +373,7 @@ function changeIsEvaluate (id){
         let pratioM =datas.mixRatioConnectData[con_key];//找到父key
         let conditions = [];
         if(pratioM&&pratioM.length>0){
-            for(let p_key in pratioM ){
+            for(let p_key of pratioM ){
                 conditions.push(gljOprObj.getConditionByKey(p_key));
             }
         }

web/building_saas/main/js/views/glj_view.js

@@ -929,6 +929,9 @@ var gljOprObj = {
         let obj ={};
         for(let i = 0;i<valueArray.length;i++){
             if(valueArray[i]!='null'){
+                if(gljKeyArray[i]=='type'){
+                    valueArray[i] = parseInt(valueArray[i]);
+                }
                 obj[gljKeyArray[i]]=valueArray[i];
             }
         }

web/building_saas/main/js/views/main_tree_col.js

@@ -158,6 +158,9 @@ let MainTreeCol = {
         },
         forContain:function (node) {
             return MainTreeCol.readOnly.non_ration(node)&&!MainTreeCol.readOnly.glj(node);
+        },
+        forCode:function (node) {
+            return MainTreeCol.readOnly.glj(node)|| (node.sourceType === projectObj.project.Ration.getSourceType()&&node.data.type===rationType.gljRation);
         }
     },
     cellType: {