Browse Source

feat: 定位在定额工程量时,回车,则不生成定额空行。

zhangweicheng 4 years ago
parent
commit
a88b39ddf7
1 changed files with 3 additions and 3 deletions
  1. 3 3
      web/building_saas/main/js/views/project_view.js

+ 3 - 3
web/building_saas/main/js/views/project_view.js

@@ -1183,7 +1183,7 @@ var projectObj = {
                 //如果其后有定额/量价/人材机(空行:编码为空不算),焦点应跳动至下一行定额/量价/人材机的工程量,不需处理
 
                 //如果其后没有定额/量价/人材机(空行也没有),则自动在其后插入一行定额空行,焦点跳动至定额空行的编码单元格
-                if(!nextSibling){
+             /*    if(!nextSibling){
                     let codeCol = colSettingObj.getColByField('code');
                     let codeVisible = colSettingObj.getVisible('code');
                     me.project.Ration.addNewRation(null, rationType.ration, function () {
@@ -1193,9 +1193,9 @@ var projectObj = {
                         }
                         sheet.setActiveCell(newRow, newCol);
                     }, true);
-                }
+                } */
                 //如果其后有定额空行,焦点跳动至定额空行的编码单元格
-                else if(nextSibling && !(isDef(nextSibling.data.code) && nextSibling.data.code.toString().trim() !== '')) {
+                if(nextSibling && !(isDef(nextSibling.data.code) && nextSibling.data.code.toString().trim() !== '')) {
                     let codeCol = colSettingObj.getColByField('code');
                     let codeVisible = colSettingObj.getVisible('code');
                     if(codeCol !== null && codeVisible !== false){