有基数计算的面积增加费不可勾选

public/web/tree_sheet/tree_sheet_helper.js

@@ -183,7 +183,7 @@ var TREE_SHEET_HELPER = {
                     cell.value(getFieldText2());
                 }
                 if (colSetting.data.cellType && Object.prototype.toString.apply(colSetting.data.cellType) !== "[object String]") {
-                    cell.cellType(colSetting.data.cellType(node,setting));
+                    cell.cellType(colSetting.data.cellType(node,setting,colSetting.data.field));
                 }
                 //树节点显示列
                 if(iCol == setting.treeCol) cell.cellType(TREE_SHEET_HELPER.getTreeNodeCellType(setting, sheet, node.tree,node));

web/building_saas/main/js/views/area_increase_fee_view.js

@@ -31,6 +31,7 @@ let areaIncreaseFeeObj = {
                         type:c.sourceType,
                         data:{ID:c.data.ID}
                     };
+                    if(c.data.calcBase&&c.data.calcBase!="") continue;
                     setData(data.data,newval,fieldName);
                     datas.push(data);
                     setChildren(c,newValue,datas)

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

@@ -418,9 +418,14 @@ let MainTreeCol = {
         mainBills:function (node) {
             if(MainTreeCol.mainBillsEnable(node)) return sheetCommonObj.getCheckBox(true);
         },
-        mainNodeCheckBox:function (node) {//分部分项、措施项目下的清单、定额
+        mainNodeCheckBox:function (node,setting,field) {//分部分项、措施项目下的清单、定额
             let Bills = projectObj.project.Bills;
-            if((Bills.isFBFX(node)||Bills.isMeasure(node)) && node.sourceType != ModuleNames.ration_glj) return sheetCommonObj.getCheckBox(false);
+            if((Bills.isFBFX(node)||Bills.isMeasure(node)) && node.sourceType != ModuleNames.ration_glj){
+                //有基数计算时面积增加费不可勾选
+                if(field == 'areaIncreaseFee' && node.data.calcBase && node.data.calcBase!="") return;
+                return sheetCommonObj.getCheckBox(false);
+            }
+
         },
         outPutMaxPrice:function (node) {
             if(MainTreeCol.mainBillsEnable(node)) {