Merge branch 'budget' of http://192.168.1.41:3000/SmartCost/ConstructionCost into budget

web/building_saas/main/js/main.js

@@ -57,7 +57,12 @@ $(function () {
         }
     });
 
-
+    //绑定F2自动打开定额库
+/*     $(document).bind('keydown', function (event) {
+        if(event.key === 'F2'){
+            $('#stdRationTab').click();
+        }
+    });  */ 
 
 });
 

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

@@ -458,7 +458,7 @@ var gljOprObj = {
         if(me.sheet.getTag(args.row,args.col)=="locked") return false;//如果是双击树节点编号里设置了锁定标记，不能编辑
         if (_.includes(me.setting.view.lockColumns, args.col))  return false;//如果是锁定的列，不能编辑
         if(recode != undefined){
-            if(recode.isMixRatio){//对于组成物列 - 可修改市场价和
+            if(recode.isMixRatio){//对于组成物列 - 可修改市场价和定额消耗量
               return dataCode == 'marketPrice' || dataCode == 'rationItemQuantity'
             }else {
                 if(dataCode == 'rationItemQuantity') return false;

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

@@ -1356,11 +1356,12 @@ var projectObj = {
                         $('#selectFBDiv').modal('show');
                     },
                     visible: function(key, opt){
-                        if(project.mainTree.selected){
+                        return true;
+                        /* if(project.mainTree.selected){
                             return project.Bills.isFBFX(project.mainTree.selected );//不属于分部分项的话隐藏
                         }else {
                             return false;
-                        }
+                        } */
                     }
                 },
                 "insertFX": {
@@ -2310,6 +2311,7 @@ var projectObj = {
             this.itemCol = _.find(setting.cols,function (item) {
                 return  item.data.field == "itemCharacterText";
             })
+            if(!this.itemCol) return false;
         }
         return this.itemCol && !this.itemCol.visible;
     },

web/building_saas/main/js/views/select_FB_view.js

@@ -60,7 +60,7 @@ let selectFBObject = {
             $.bootstrapLoading.start();
             let treeData = await ajaxPost('/complementaryRation/api/getRationTree', {userId: userID, rationRepId: rationLibID, type: 1});
             this.rationChapterTree = idTree.createNew({id: 'ID', pid: 'ParentID', nid: 'NextSiblingID', rootId: -1, autoUpdate: false});
-            rationChapterTree.loadDatas(treeData);
+            this.rationChapterTree.loadDatas(treeData);
             $.bootstrapLoading.end();
         }
         if(this.rationChapterTree.roots.length >0){