工料机汇总，黄色显示，放开删除按钮

package.json

@@ -64,6 +64,9 @@
     "start": "C:\\Users\\mai\\AppData\\Roaming\\npm\\babel-node.cmd server.js",
     "server": "node --max-old-space-size=2048 server.js",
     "socket": "node socket.js",
-    "import": "node --max-old-space-size=2048 importserver.js"
+    "import": "node --max-old-space-size=2048 importserver.js",
+    "dev_server":"SET NODE_ENV=qa&& babel-node server.js",
+    "dev_socket":"SET NODE_ENV=qa&& babel-node socket.js",
+    "dev_import":"SET NODE_ENV=qa&& babel-node importserver.js"
   }
 }

public/web/sheet/sheet_common.js

@@ -307,9 +307,6 @@ var sheetCommonObj = {
         for (var row = 0; row < data.length; row++) {
             //var cell = sheet.getCell(row, col, GC.Spread.Sheets.SheetArea.viewport);
             this.showRowData(sheet,setting,row,data,distTypeTree);
-            if(setting.getStyle && setting.getStyle(data[row])){
-                sheet.setStyle(row, -1, setting.getStyle(data[row]));
-            }
         }
         if(setting.emptyRowHeader){
             let rowCount = sheet.getRowCount();
@@ -399,6 +396,9 @@ var sheetCommonObj = {
 
             sheet.autoFitRow(row);
         }
+        if(setting.getStyle && setting.getStyle(data[row],row,sheet.getActiveRowIndex())){
+          sheet.setStyle(row, -1, setting.getStyle(data[row]));
+        }
     },
     checkData : function(col,setting, value) {
         let result = true;

web/building_saas/main/html/main.html

@@ -110,7 +110,7 @@
                 </span>
                       <% } %>
                     <!--<a href="javascript:void(0)" class="btn btn-light btn-sm" id="insertRation" data-toggle="tooltip" data-placement="bottom" data-original-title="插入定额"><i class="fa fa-sign-in" aria-hidden="true"></i></a>-->
-                    <!--2018-11-15 隐藏删除按钮   <a href="javascript:void(0)" class="btn btn-light btn-sm" id="delete" data-toggle="tooltip" data-placement="bottom" data-original-title="删除"><i class="fa fa-remove" aria-hidden="true"></i></a>-->
+                    <a href="javascript:void(0)" class="btn btn-light btn-sm" id="delete" data-toggle="tooltip" data-placement="bottom" data-original-title="删除"><i class="fa fa-remove" aria-hidden="true"></i></a>
                     <a href="javascript:void(0)" class="btn btn-light btn-sm" id="upLevel" data-toggle="tooltip" data-placement="bottom" data-original-title="升级"><i class="fa fa-arrow-left" aria-hidden="true"></i></a>
                     <a href="javascript:void(0)"  class="btn btn-light btn-sm" id="downLevel" data-toggle="tooltip" data-placement="bottom" data-original-title="降级"><i class="fa fa-arrow-right" aria-hidden="true"></i></a>
                       <a href="javascript:void(0)" class="btn btn-light btn-sm" id="upMove" data-toggle="tooltip" data-placement="bottom" data-original-title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>

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

@@ -68,7 +68,13 @@ let gljCol = {
             lockColumns: ["code","name","specs","unit","short_name","tenderPrice","adjustPrice","quantity","tenderQuantity"]
         },
         frozenCols:4,
-        headRows:2
+        headRows:2,
+        getStyle:function (data,row,activeRow) {
+          if(row == activeRow){//选中黄色显示
+              return {backColor:"#FFFACD"};
+          }
+          return null;
+      },
     },
     mixRatio_Setting:{
         header:[

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

@@ -348,7 +348,7 @@ var gljOprObj = {
             gljOprObj.initSelection({row: gljOprObj.gljLibSheet.getActiveRowIndex()});
         });
     },
-    getSelStyle: function (selected,settingStyle) {
+    getSelStyle: function (selected,settingStyle,rcolor) {
         let style = new GC.Spread.Sheets.Style();
         if(settingStyle){
             for(let key in settingStyle){
@@ -361,7 +361,7 @@ var gljOprObj = {
         style.borderBottom = new GC.Spread.Sheets.LineBorder("#D4D4D4", GC.Spread.Sheets.LineStyle.thin);
         let colorOpts = optionsOprObj.getOption(optionsOprObj.optionsTypes.COLOROPTS);
         let selectedColor = colorOpts.SELECTED.backColor,
-            recColor = 'White';
+            recColor =  rcolor?rcolor:'White';
         style.backColor = selected ? selectedColor : recColor;
         return style;
     },

web/building_saas/main/js/views/project_glj_view.js

@@ -213,19 +213,19 @@ let projectGljObject={
             gljId = null
         }
         projectObj.project.projectGLJ.getRatioData(gljId,function (data) {
-            if(gljId !== projectObj.project.projectGLJ.getRatioId){//两个id不一致说明不是最新的请求，不用往下执行。
-                return;
-            }
-            let ratioList =[];
-            for(let glj of data){
-                ratioList.push(me.getMixRatioSheetData(glj)) ;
-            }
-            ratioList = gljUtil.sortRationGLJ(ratioList);
-            me.mixRatioData = ratioList;
-            me.mixRatioSheet.setRowCount(0);
-            sheetCommonObj.showData(me.mixRatioSheet, me.mixRatioSetting,me.mixRatioData);
-            me.mixRatioSheet.setRowCount(me.mixRatioData.length);
-            me.mixRatioSheet.setSelection(oldSel.row==-1?0:oldSel.row,oldSel.col,oldSel.rowCount,oldSel.colCount);
+          if(gljId !== projectObj.project.projectGLJ.getRatioId){//两个id不一致说明不是最新的请求，不用往下执行。
+              return;
+          }
+          let ratioList =[];
+          for(let glj of data){
+              ratioList.push(me.getMixRatioSheetData(glj)) ;
+          }
+          ratioList = gljUtil.sortRationGLJ(ratioList);
+          me.mixRatioData = ratioList;
+          me.mixRatioSheet.setRowCount(0);
+          sheetCommonObj.showData(me.mixRatioSheet, me.mixRatioSetting,me.mixRatioData);
+          me.mixRatioSheet.setRowCount(me.mixRatioData.length);
+          me.mixRatioSheet.setSelection(oldSel.row==-1?0:oldSel.row,oldSel.col,oldSel.rowCount,oldSel.colCount);
         })
     },
     getMixRatioSheetData:function (glj) {
@@ -309,10 +309,20 @@ let projectGljObject={
         let me = projectGljObject;
         let newSel = args.newSelections[0];
         let oldSel = args.oldSelections?args.oldSelections[0]:{};
+        me.projectGljSheet.suspendPaint();
+        me.projectGljSheet.suspendEvent();
         if(newSel.row != oldSel.row){
-           me.projectGljRowChang();
-        }
-        me.projectGljSheet.repaint();
+          let style = gljOprObj.getSelStyle(true,{});
+          me.projectGljSheet.setStyle(newSel.row, -1, style);
+          let orow = oldSel.row==''||oldSel.row==-1?0:oldSel.row;
+          let tstyle = gljOprObj.getSelStyle(false,{},me.projectGljSheetData[orow].bgColour);
+          me.projectGljSheet.setStyle(orow, -1, tstyle);
+          me.projectGljRowChang();
+        }else{
+          me.projectGljSheet.repaint();
+        }
+        me.projectGljSheet.resumeEvent();
+        me.projectGljSheet.resumePaint();
     },
     projectGljRowChang:function(row){
         let me = projectGljObject;

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

@@ -1660,9 +1660,6 @@ var projectObj = {
                     name: '删除',
                     icon: 'fa-remove',
                     disabled: function () {
-                        if (projectReadOnly) {
-                            return true;
-                        }
                         return !ifCanDelete();
                     },
                     callback: function () {
@@ -2871,6 +2868,9 @@ function isSingleSelect() {//是否选中造价书中的单行
     return false;
 }
 function ifCanDelete() {
+    if (projectReadOnly) {
+      return false;
+    }
     let selections = projectObj.mainSpread.getActiveSheet().getSelections();
     let tree = projectObj.project.mainTree;
     let selected = projectObj.project.mainTree.selected;