bugs

web/building_saas/main/js/views/fee_rate_view.js

@@ -185,7 +185,6 @@ var feeRateObject={
         sheet.rowOutlines.group(22, 6);*/
        // sheet.getRange(-1, 0, -1, 1).width(300);
         sheet.showRowOutline(false);
-        feeRateObject.locate();
         sheet.resumeEvent();
         sheet.resumePaint(false);
     },
@@ -1044,6 +1043,7 @@ $(function(){
         }
         feeRateObject.feeRateSelection=null;
         feeRateObject.showSelectTree(feeRateObject.feeRateSheet,feeRateObject.sheetSetting,projectObj.project.FeeRate.getActivateFeeRate().rates);
+        feeRateObject.locate();
     });
 
     $('#fee_rate_tree').on('hidden.bs.modal', function (e) {

web/building_saas/main/js/views/glj_col.js

@@ -16,7 +16,7 @@ let gljCol = {
             {headerName: "定额价", headerWidth: 80, dataCode: "basePrice", dataType: "Number", hAlign: "right", decimalField: "glj.unitPrice"},
             {headerName: "调整价", headerWidth: 80, dataCode: "adjustPrice", dataType: "Number", hAlign: "right", decimalField: "glj.unitPrice"},
             {headerName: "市场价", headerWidth: 80, dataCode: "marketPrice", dataType: "Number", hAlign: "right", decimalField: "glj.unitPrice"},
-            {headerName: "是否暂估", headerWidth: 65, dataCode: "isEstimate", dataType: "String", hAlign: "center", vAlign: "center", cellType: "checkBox"
+            {headerName: "暂估", headerWidth: 65, dataCode: "isEstimate", dataType: "String", hAlign: "center", vAlign: "center", cellType: "checkBox"
             }
         ],
         view: {
@@ -32,12 +32,12 @@ let gljCol = {
             {headerName: "规格型号", headerWidth: 120, dataCode: "specs", hAlign: "left", dataType: "String"},
             {headerName: "单位", headerWidth: 45, dataCode: "unit", hAlign: "center", dataType: "String"},
             {headerName: "类型", headerWidth: 45, dataCode: "short_name", hAlign: "center", dataType: "String"},
-            {headerName: "总消耗量", headerWidth: 130, dataCode: "quantity", hAlign: "right", dataType: "Number",decimalField:'glj.quantity'},
+            {headerName: "总消耗量", headerWidth: 90, dataCode: "quantity", hAlign: "right", dataType: "Number",decimalField:'glj.quantity'},
             {headerName: "定额价", headerWidth: 70, dataCode: "basePrice", hAlign: "right", dataType: "Number",decimalField:'glj.unitPrice',validator:"number"},
             {headerName: "调整价", headerWidth: 70, dataCode: "adjustPrice", hAlign: "right", dataType: "Number",decimalField:"glj.unitPrice"},
             {headerName: "市场价", headerWidth: 70, dataCode: "marketPrice", hAlign: "right", dataType: "Number",decimalField:"glj.unitPrice",validator:"number"},
-            {headerName: "是否暂估", headerWidth: 60, dataCode: "is_evaluate", hAlign: "center", dataType: "String",cellType:'checkBox'},
-            {headerName: "主要材料", headerWidth: 60, dataCode: "is_main_material", hAlign: "center", dataType: "String",cellType:'checkBox'},
+            {headerName: "暂估", headerWidth: 60, dataCode: "is_evaluate", hAlign: "center", dataType: "String",cellType:'checkBox'},
+            {headerName: "主要\n材料", headerWidth: 60, dataCode: "is_main_material", hAlign: "center", dataType: "String",cellType:'checkBox'},
             {headerName: "供货方式", headerWidth: 80, dataCode: "supply", hAlign: "center", dataType: "String",cellType:'comboBox',editorValueType:true,options:supplyComboMap},
             {headerName: "甲供数量", headerWidth: 100, dataCode: "supply_quantity", hAlign: "right", dataType: "Number",validator:"number",decimalField:'glj.quantity'},
             {headerName: "三材类别", headerWidth: 80, dataCode: "materialType", hAlign: "center", dataType: "String",cellType:'comboBox',editorValueType:true,options:materialComboMap},

web/building_saas/main/js/views/glj_view_contextMenu.js

@@ -11,35 +11,31 @@ var gljContextMenu = {
             selector: '#subSpread',
             build: this.onbuild,
             items: {
-                "delete_glj": {
-                    name: '删除人材机',
-                    icon: 'fa-remove',
+                "replace_glj": {
+                    name: '替换',
+                    icon: 'fa-sign-in',
                     disabled: function () {
                         var sheetData = gljOprObj.sheetData;
                         if(gljOprObj.isInstallationNode(projectObj.project.mainTree.selected)){
                             return true;
                         }
                         if(subSpread.getActiveSheetIndex()==0&&sheetData!=null&&sheetData.length>0&&gljContextMenu.selectedRow<sheetData.length){
-                            if( sheetData[gljContextMenu.selectedRow].isMixRatio==true){
+                            if(sheetData[gljContextMenu.selectedRow].isMixRatio==true){
                                 return true;
                             }
                             return false;
-                        }else {
-                            return true;
                         }
-
+                        return true;
                     },
                     callback: function () {
-                        var sheetData = gljOprObj.sheetData;
-                        var deleteRow = sheetData[gljContextMenu.selectedRow];
-                        projectObj.project.ration_glj.updataOrdelete(deleteRow);
+                        getGLJData('replace');
                     },
                     visible: function(key, opt){
                         return subSpread.getActiveSheet().name()=='ration_glj';
                     }
                 },
                 "add_glj": {
-                    name: '添加人材机',
+                    name: '添加',
                     icon: 'fa-sign-in',
                     disabled: function () {
                         var selected = projectObj.project.mainTree.selected;
@@ -65,31 +61,35 @@ var gljContextMenu = {
                         return subSpread.getActiveSheet().name()=='ration_glj';
                     }
                 },
-                "replace_glj": {
-                    name: '替换人材机',
-                    icon: 'fa-sign-in',
+                "delete_glj": {
+                    name: '删除',
+                    icon: 'fa-remove',
                     disabled: function () {
                         var sheetData = gljOprObj.sheetData;
                         if(gljOprObj.isInstallationNode(projectObj.project.mainTree.selected)){
                             return true;
                         }
                         if(subSpread.getActiveSheetIndex()==0&&sheetData!=null&&sheetData.length>0&&gljContextMenu.selectedRow<sheetData.length){
-                            if(sheetData[gljContextMenu.selectedRow].isMixRatio==true){
+                            if( sheetData[gljContextMenu.selectedRow].isMixRatio==true){
                                 return true;
                             }
                             return false;
+                        }else {
+                            return true;
                         }
-                        return true;
+
                     },
                     callback: function () {
-                        getGLJData('replace');
+                        var sheetData = gljOprObj.sheetData;
+                        var deleteRow = sheetData[gljContextMenu.selectedRow];
+                        projectObj.project.ration_glj.updataOrdelete(deleteRow);
                     },
                     visible: function(key, opt){
                         return subSpread.getActiveSheet().name()=='ration_glj';
                     }
                 },
                 "m_replace_glj": {
-                    name: '批量替换人材机',
+                    name: '批量替换',
                     icon: 'fa-sign-in',
                     disabled: function () {
                         let sheetData = gljOprObj.sheetData;

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

@@ -521,11 +521,14 @@ var projectObj = {
         let newV;
         if(node && node.sourceType === projectObj.project.Ration.getSourceType() && node.data.type === rationType.ration
             && isDef(node.data.code) && isDef(node.data.prefix) && node.data.prefix !== rationPrefix.none && fieldName === 'code'){
-            if(node.data.prefix === rationPrefix.complementary){
-                newV = orgV.replace(new RegExp('补'), '');
+/*            if(node.data.prefix === rationPrefix.complementary){
+                newV = orgV.replace(new RegExp(rationPrefix.complementary), '');
             }
             if(node.data.prefix === rationPrefix.borrow){
-                newV = orgV.replace(new RegExp('借'), '');
+                newV = orgV.replace(new RegExp(rationPrefix.borrow), '');
+            }*/
+            if(node.data.prefix){
+                newV = orgV.replace(new RegExp(node.data.prefix), '');
             }
             info.sheet.setValue(info.row, info.col, newV);
         }