Browse Source

1. 新建项目问题
2. 台账分解,上下移界面刷新失效

MaiXinRong 6 years ago
parent
commit
1d8b8fc1f9
3 changed files with 9 additions and 11 deletions
  1. 2 7
      app/public/js/ledger.js
  2. 4 0
      app/public/js/path_tree.js
  3. 3 4
      app/service/tender.js

+ 2 - 7
app/public/js/ledger.js

@@ -215,12 +215,9 @@ $(document).ready(function() {
             if (!node) { return; }
 
             tree.baseOperation('/tender/' + getTenderId() + '/ledger/base-operation', node, 'up-move', function (result) {
-                for (const data of result.update) {
-                    SpreadJsObj.reLoadRowData(sheet, tree.nodes.indexOf(data), tree.getPosterity(data).length + 1);
-                }
+                self.refreshTree(sheet, result);
                 sheet.setSelection(tree.nodes.indexOf(node), sel.col, sel.rowCount, sel.colCount);
                 self.refreshOperationValid(sheet, sheet.getSelections());
-                //sheet.moveTo(row, -1, tree.nodes.indexOf(node), -1, tree.getPosterity(node).length + 1, -1, GC.Spread.Sheets.CopyToOptions.value);
             });
 
         },
@@ -241,9 +238,7 @@ $(document).ready(function() {
             if (!node) { return; }
 
             tree.baseOperation('/tender/' + getTenderId() + '/ledger/base-operation', node, 'down-move', function (result) {
-                for (const data of result.update) {
-                    SpreadJsObj.reLoadRowData(sheet, tree.nodes.indexOf(data), tree.getPosterity(data).length + 1);
-                }
+                self.refreshTree(sheet, result);
                 sheet.setSelection(tree.nodes.indexOf(node), sel.col, sel.rowCount, sel.colCount);
                 self.refreshOperationValid(sheet, sheet.getSelections());
             });

+ 4 - 0
app/public/js/path_tree.js

@@ -247,6 +247,10 @@ const createNewPathTree = function (type, setting) {
                     nodes[i].index = self.nodes.length - 1;
                     if (!isResort) {
                         nodes[i].children = self.getChildren(nodes[i]);
+                    } else {
+                        nodes[i].children.sort(function (a, b) {
+                            return a.order - b.order;
+                        })
                     }
                     addSortNodes(nodes[i].children);
                 }

+ 3 - 4
app/service/tender.js

@@ -147,12 +147,11 @@ module.exports = app => {
                 if (!result) {
                     throw '新增标段项目节点失败';
                 }
-                this.transaction.commit();
+                await this.transaction.commit();
                 return await this.getTender(operate.insertId);
             } catch (error) {
-                console.log(error);
-                result = false;
-                this.transaction.rollback();
+                await this.transaction.rollback();
+                throw error;
             }
         }