1. 台账审批，只显示项目节问题

2. 各页面，定位问题

app/public/js/ledger.js

@@ -493,6 +493,7 @@ $(document).ready(function() {
         selectionChanged: function (e, info) {
             if (info.newSelections[0].row !== info.oldSelections[0].row) {
                 posOperationObj.loadCurPosData();
+                SpreadJsObj.resetTopAndSelect(posSpread.getActiveSheet());
                 posSearch.search($('#pos-keyword').val());
             }
             SpreadJsObj.saveTopAndSelect(info.sheet, ckBillsSpread);
@@ -745,6 +746,7 @@ $(document).ready(function() {
         postData('/tender/' + getTenderId() + '/pos', null, function (data) {
             pos.loadDatas(data);
             posOperationObj.loadCurPosData();
+            SpreadJsObj.resetTopAndSelect(posSpread.getActiveSheet());
         });
         $('#pos-keyword').bind('input propertychange', function () {
             posSearch.search(this.value);
@@ -772,7 +774,6 @@ $(document).ready(function() {
             } else {
                 SpreadJsObj.loadSheetData(posSpread.getActiveSheet(), 'data', []);
             }
-            SpreadJsObj.resetTopAndSelect(posSpread.getActiveSheet());
         },
         /**
          * 编辑单元格响应事件

app/public/js/ledger_audit.js

@@ -20,7 +20,7 @@ function checkTzMeasureType () {
 $(document).ready(() => {
     autoFlashHeight();
     const ledgerSpread = SpreadJsObj.createNewSpread($('#ledger-spread')[0]);
-    const ledgerTree = createNewPathTree('base', {
+    const ledgerTree = createNewPathTree('fx', {
         id: 'ledger_id',
         pid: 'ledger_pid',
         order: 'order',
@@ -48,7 +48,6 @@ $(document).ready(() => {
         } else {
             SpreadJsObj.loadSheetData(posSpread.getActiveSheet(), 'data', []);
         }
-        SpreadJsObj.resetTopAndSelect(posSpread.getActiveSheet());
     };
     // 台账模式加载部位明细数据
     if (checkTzMeasureType()) {
@@ -65,6 +64,7 @@ $(document).ready(() => {
         postData('/tender/' + getTenderId() + '/pos', null, function (data) {
             pos.loadDatas(data);
             loadCurPosData();
+            SpreadJsObj.resetTopAndSelect(posSpread.getActiveSheet());
         });
     }
 

app/public/js/path_tree.js

@@ -1223,6 +1223,8 @@ const createNewPathTree = function (type, setting) {
 
     if (type === 'base') {
         return new BaseTree(setting);
+    } else if (type === 'fx') {
+        return new FxTree(setting);
     } else if (type === 'stage') {
         return new StageTree(setting);
     } else if (type === 'ledger') {

app/public/js/revise.js

@@ -135,9 +135,10 @@ $(document).ready(() => {
             if (info.newSelections[0].row !== info.oldSelections[0].row) {
                 billsTreeSpreadObj.refreshOperationValid(info.sheet);
                 posSpreadObj.loadCurPosData();
+                SpreadJsObj.saveTopAndSelect(posSheet, ckBillsSpread);
+                SpreadJsObj.resetTopAndSelect(billsSheet);
                 //posSearch.search($('#pos-keyword').val());
             }
-            SpreadJsObj.saveTopAndSelect(info.sheet, ckBillsSpread);
         },
         /**
          * 新增节点
@@ -285,6 +286,7 @@ $(document).ready(() => {
         },
     };
     posSpreadObj.loadCurPosData();
+    SpreadJsObj.resetTopAndSelect(posSheet);
 
     $.divResizer({
         select: '#revise-resize',

app/public/js/stage.js

@@ -526,6 +526,7 @@ $(document).ready(() => {
         },
         selectionChanged: function (e, info) {
             stagePosSpreadObj.loadCurPosData();
+            SpreadJsObj.resetTopAndSelect(spSpread.getActiveSheet());
             SpreadJsObj.saveTopAndSelect(info.sheet, ckBillsSpread);
         },
         deletePress(sheet) {
@@ -813,7 +814,6 @@ $(document).ready(() => {
             } else {
                 SpreadJsObj.loadSheetData(spSpread.getActiveSheet(), 'data', []);
             }
-            SpreadJsObj.resetTopAndSelect(spSpread.getActiveSheet());
         },
         editEnded: function (e, info) {
             if (info.sheet.zh_setting) {
@@ -1056,6 +1056,7 @@ $(document).ready(() => {
         }
         stagePos.calculateAll();
         stagePosSpreadObj.loadCurPosData();
+        SpreadJsObj.resetTopAndSelect(spSpread.getActiveSheet());
     });
     spSpread.bind(spreadNS.Events.EditEnded, stagePosSpreadObj.editEnded);
     spSpread.bind(spreadNS.Events.ClipboardPasting, stagePosSpreadObj.clipboardPasting);

app/service/stage_detail.js

@@ -167,13 +167,13 @@ module.exports = app => {
                         delete od.flow;
                         if (od.times === this.ctx.stage.curTimes && od.order === this.ctx.stage.curOrder) {
                             d.id = od.id;
-                            await this.db.update(this.tableName, d);
+                            await transaction.update(this.tableName, d);
                             result.push(d);
                         } else {
                             const nd = this._.assign(od, data);
                             nd.times = this.ctx.stage.curTimes;
                             nd.order = this.ctx.stage.curOrder;
-                            await this.db.insert(this.tableName, nd);
+                            await transaction.insert(this.tableName, nd);
                             result.push(nd);
                         }
                     } else {
@@ -186,6 +186,7 @@ module.exports = app => {
                         result.push(d);
                     }
                 }
+                await transaction.commit();
                 return result;
             } catch (err) {
                 await transaction.rollback();

app/view/stage/compare.ejs

@@ -14,7 +14,7 @@
                         <a class="dropdown-item" name="showLevel" tag="4" href="javascirpt: void(0);">第四层</a>
                         <a class="dropdown-item" name="showLevel" tag="5" href="javascirpt: void(0);">第五层</a>
                         <a class="dropdown-item" name="showLevel" tag="last" href="javascirpt: void(0);">最底层</a>
-                        <a class="dropdown-item" name="curMeasure" tag="leafXmj" href="javascirpt: void(0);">只显示项目节</a>
+                        <a class="dropdown-item" name="showLevel" tag="leafXmj" href="javascirpt: void(0);">只显示项目节</a>
                     </div>
                 </div>
             </div>