主材设备不显示问题

web/building_saas/main/js/models/project.js

@@ -61,6 +61,7 @@ var PROJECT = {
             if (isInit) {
                 projectInfoObj.showProjectInfo(me._project.projectInfo);
             }
+            me._project.property = me._project.projectInfo.property;
             me._project.loadMainTree();
             //me.test(result[0].data[0]);
             if (callback) {

web/building_saas/main/js/views/project_view.js

@@ -141,7 +141,7 @@ var projectObj = {
             return true;
         };
         let canUpMove = function (node) {
-            if(node&&node.preSibling){//有前兄弟
+            if(node&&node.sourceType!= ModuleNames.ration_glj &&node.preSibling){//有前兄弟 并且不是定额工料机
                 if(node.sourceType==that.project.Bills.getSourceType()){
                     if(projectObj.project.isBillsLocked()== true && projectObj.project.withinBillsLocked(node)){
                         return false;
@@ -155,7 +155,7 @@ var projectObj = {
             return false
         };
         let canDownMove = function (node) {
-            if(node&&node.nextSibling){
+            if(node&& node.sourceType!= ModuleNames.ration_glj &&node.nextSibling){//并且不是定额工料机
                 if(node.sourceType==that.project.Bills.getSourceType()){
                     if(projectObj.project.isBillsLocked()== true && projectObj.project.withinBillsLocked(node)){
                         return false;
@@ -922,7 +922,7 @@ var projectObj = {
                 that.project.projectGLJ.calcQuantity(true);//计算分部分项和技术措施项目消耗量;
                 let quantityTime = +new Date();
                 console.log(`计算quantity时间——${quantityTime - mTime}`);
-                that.project.property = projectObj.project.projectInfo.property;
+                //that.project.property = projectObj.project.projectInfo.property;  改在doAfterLoad的时候设置
                 gljCol.initGljCol(that.project.projSetting.glj_col?that.project.projSetting.glj_col.showAdjustPrice:false,
                     that.project.property.tenderSetting.showTenderFields?that.project.property.tenderSetting.showTenderFields:false);
                 subObj.initSubSpread();//初始化主界面下方的表格