|
|
@@ -1112,6 +1112,8 @@ var projectObj = {
|
|
|
//将焦点行设置成原本的行，以插入定额
|
|
|
me.mainController.setTreeSelected(me.project.mainTree.items[orgRow]);
|
|
|
}
|
|
|
+ /*
|
|
|
+ 2021-04-26 只插入清单不插入定额
|
|
|
//插入定额
|
|
|
me.project.Ration.addNewRation(null, rationType.ration, function () {
|
|
|
newRow = sheet.getActiveRowIndex();
|
|
|
@@ -1121,7 +1123,7 @@ var projectObj = {
|
|
|
newCol = codeCol;
|
|
|
}
|
|
|
sheet.setActiveCell(newRow, newCol);
|
|
|
- },true,null,false);
|
|
|
+ },true,null,false); */
|
|
|
}
|
|
|
}
|
|
|
//在定额/量价/人材机的编码单元格回车，焦点应跳动至本行的工程量单元格
|
|
|
@@ -1139,7 +1141,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 () {
|
|
|
@@ -1149,9 +1151,9 @@ var projectObj = {
|
|
|
}
|
|
|
sheet.setActiveCell(newRow, newCol);
|
|
|
}, true,null,false);
|
|
|
- }
|
|
|
+ } */
|
|
|
//如果其后有定额空行，焦点跳动至定额空行的编码单元格
|
|
|
- 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){
|
