bug fixed

web/building_saas/main/js/models/ration.js

@@ -417,7 +417,7 @@ var Ration = {
                    }
                 }
                 project.projectGLJ.loadData(function () {
-                    gljOprObj.showDataIfRationSelect(projectObj.project.mainTree.selected);
+                    gljOprObj.showDataIfRationSelect(projectObj.project.mainTree.selected,"-111111111");//这里第二个参数是为了使改前和改后selectedID不一样，删除了的话下方的定额工料机不会刷新
                     project.calcProgram.calcRationsAndSave(refershNodes);
                     projectObj.mainController.refreshTreeNode(refershNodes, true);
                     $.bootstrapLoading.end();

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

@@ -364,6 +364,9 @@ var projectObj = {
         if (node.sourceType === project.Bills.getSourceType()) {
             this.updateBillsCode(node, value);   // 新清单不适合实时计算，下面套什么还不能确定，无数量计算也无意义
         } else if (node.sourceType === project.Ration.getSourceType()) {
+            if(value && typeof(value) == 'string'){//小写转换成大写
+                value = value.toUpperCase();
+            }
             project.Ration.updateRationCodes([{'node':node,value:value}]);
           //  this.updateRationCode(node, value);  // 新套定额适合实时计算
             // 这里因异步问题暂时缺少工料机价格。该过程移到：ration_glj.js的refreshAfterSave方法中。
@@ -921,7 +924,39 @@ var projectObj = {
                     callback: function () {
                         project.calcProgram.calcAllNodesAndSave();
                     }
-                }
+                }/*,
+                "spr2":'--------',
+                "copyBlock": {
+                    name: '复制整块',
+                    icon: 'fa-copy',
+                    disabled: function () {
+                        let selected = project.mainTree.selected;
+                        if(selected.sourceType == project.Bills.getSourceType() && selected.data.type == billType.DXFY){//焦点行是大项费用则无效；
+                            return true;
+                        }
+                        if(selected.sourceType == project.ration_glj.getSourceType()){// 焦点行是定额下的主材设备则无效；
+                            return true;
+                        }
+                        return false;
+                    },
+                    callback: function () {
+                        $.bootstrapLoading.start();
+                        let selected = project.mainTree.selected;
+                        setTimeout(function () {
+                            BlockController.copyBlock(selected);
+                            $.bootstrapLoading.end();
+                        },100)
+
+                    }
+                },
+                "spr2":'--------',
+                "pasteBlock": {
+                    name: '粘贴整块',
+                    icon: 'fa-paste',
+                    callback: function () {
+
+                    }
+                }*/
             }
         });
     },
@@ -1830,6 +1865,4 @@ $(function () {
             spread?spread.focus():'';
         }
     }
-
-
 });