Bläddra i källkod

1. 升级节点Bug
2. 最底层节点默认展开

MaiXinRong 6 år sedan
förälder
incheckning
7657cfd5a9
2 ändrade filer med 11 tillägg och 3 borttagningar
  1. 4 3
      app/public/js/path_tree.js
  2. 7 0
      app/service/ledger.js

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

@@ -281,7 +281,8 @@ const createNewPathTree = function (type, setting) {
             }
             this.sortTreeNode();
             for (const node of this.nodes) {
-                node.expanded = node.children.length > 0;
+                //node.expanded = node.children.length > 0;
+                node.expanded = true;
                 node.visible = true;
             }
         }
@@ -574,7 +575,7 @@ const createNewPathTree = function (type, setting) {
             loadedData = _.uniq(loadedData);
             for (const node of loadedData) {
                 node.children = this.getChildren(node);
-                node.expanded = node.children.length > 0 && node.children[0].visible;
+                node.expanded = node.children.length === 0 ? true : node.children[0].visible;
             }
             this.sortTreeNode(true);
             return loadedData;
@@ -606,7 +607,7 @@ const createNewPathTree = function (type, setting) {
                     const node = JSON.parse(JSON.stringify(data));
                     this.items[keyName] = node;
                     this.datas.push(node);
-                    node.expanded = false;
+                    node.expanded = true;
                     node.visible = true;
                     loadedData.push(node);
                     if (resortData.indexOf(node) === -1) {

+ 7 - 0
app/service/ledger.js

@@ -830,10 +830,12 @@ module.exports = app => {
          * @return {Promise<void>}
          */
         async addStdNodeWithParent(tenderId, stdData, stdLib) {
+            // 查询完整标准清单,并按层次排序
             const fullLevel = await stdLib.getFullLevelDataByFullPath(stdData.list_id, stdData.full_path);
             fullLevel.sort(function(x, y) {
                 return x.level - y.level;
             });
+
             let isNew = false,
                 node,
                 firstNew,
@@ -842,6 +844,7 @@ module.exports = app => {
             const expandIds = [];
             this.transaction = await this.db.beginTransaction();
             try {
+                // 从最顶层节点依次查询是否存在,否则添加
                 for (let i = 0, len = fullLevel.length; i < len; i++) {
                     const stdNode = fullLevel[i];
 
@@ -1091,6 +1094,10 @@ module.exports = app => {
                     value: Math.abs(orderInc),
                     selfOperate: orderInc > 0 ? '+' : '-',
                 });
+                this.sqlBuilder.setAndWhere('tender_id', {
+                    value: selectData.tender_id,
+                    operate: '=',
+                });
                 this.sqlBuilder.setAndWhere('ledger_pid', {
                     value: selectData.ledger_pid,
                     operate: '=',