bug fixed

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

@@ -1221,7 +1221,11 @@ var gljOprObj = {
             return offset;
         }
 
-        TreeNodeCellType.prototype =  data[index]&&data[index].isMixRatio?new ns.CellTypes.Text(): sheetCommonObj.getDynamicCombo();//new ns.CellTypes.Text();
+        if(index && data[index] && data[index].isMixRatio !==true){
+            TreeNodeCellType.prototype =  sheetCommonObj.getDynamicCombo();
+        }else {
+            TreeNodeCellType.prototype =  new ns.CellTypes.Text();
+        }
         TreeNodeCellType.prototype.paint = function (ctx, value, x, y, w, h, style, options) {
             if (value != null) {
                 var offset = margin + rectW + 6;
@@ -1277,7 +1281,7 @@ var gljOprObj = {
         };
         let cellType = new TreeNodeCellType();
         let options = [];
-        if(!(data[index]&&data[index].isMixRatio)){
+        if(index && data[index] && data[index].isMixRatio !==true){
             let code = data[index].code;
             if(code) {
                 let preCode = code.split("-")[0];

web/building_saas/main/js/views/installation_fee_view.js

@@ -63,11 +63,11 @@ let installationFeeObj={
             {headerName: "费用规则", headerWidth: 220, dataCode: "rule", hAlign: "left", dataType: "String",getText:'forRule'},
             {headerName: "编码", headerWidth: 70, dataCode: "code", hAlign: "left", dataType: "String"},
             {headerName: "基数", headerWidth: 80, dataCode: "base", hAlign: "left", dataType: "String",cellType:'comboBox',options:installSectionBase},
-            {headerName: "费率（%）", headerWidth: 70, dataCode: "feeRate", hAlign: "right", dataType: "String"},
-            {headerName: "人工（%）", headerWidth: 70, dataCode: "labour", hAlign: "right", dataType: "String"},
-            {headerName: "材料（%）", headerWidth: 70, dataCode: "material", hAlign: "right", dataType: "String"},
-            {headerName: "机械（%）", headerWidth: 70, dataCode: "machine", hAlign: "right", dataType: "String"},
-            {headerName: "记取位置", headerWidth: 200, dataCode: "position", hAlign: "left", dataType: "String",cellType:'selectButton'}
+            {headerName: "费率（%）", headerWidth: 75, dataCode: "feeRate", hAlign: "right", dataType: "String"},
+            {headerName: "人工（%）", headerWidth: 75, dataCode: "labour", hAlign: "right", dataType: "String"},
+            {headerName: "材料（%）", headerWidth: 75, dataCode: "material", hAlign: "right", dataType: "String"},
+            {headerName: "机械（%）", headerWidth: 75, dataCode: "machine", hAlign: "right", dataType: "String"},
+            {headerName: "记取位置", headerWidth: 180, dataCode: "position", hAlign: "left", dataType: "String",cellType:'selectButton'}
         ],
         view: {
             lockColumns: [0, 2]

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

@@ -551,7 +551,7 @@ var projectObj = {
 
     },
     showBillOrRationLib(node){
-        if(node.sourceType == ModuleNames.bills){//
+        if(node.sourceType == ModuleNames.bills){//当清单是“分部分项工程”、“措施项目工程”时，要展开清单规则节点
 
         }