Browse Source

修复变更部位台账部分bug

laiguoran 3 years atrás
parent
commit
4f0e67bb44
2 changed files with 4 additions and 3 deletions
  1. 2 1
      app/public/js/change_revise.js
  2. 2 2
      app/service/change_ledger.js

+ 2 - 1
app/public/js/change_revise.js

@@ -337,8 +337,9 @@ $(document).ready(() => {
             setObjEnable($('a[name=base-opr][type=up-level]'), valid && first && sameParent && tree.getParent(first) && !nodeUsed
                 && first.level > 2 && ((!posRange || posRange.length === 0) || tree.isLastSibling(last)) && upPower && first.ccid);
             const preNodePosRange = preNode ? pos.getLedgerPos(preNode.id) : [];
+            console.log(preNode);
             setObjEnable($('a[name=base-opr][type=down-level]'), valid && first && sameParent
-                && first.level > 1 && preNode && (preNode.code || (!preNode.code && preNode.ccid && (!preNodePosRange || preNodePosRange.length === 0))) && !preNode.used && first.ccid);
+                && first.level > 1 && preNode && (preNode.children.length > 0 || (preNode.children.length === 0 && preNode.ccid && (!preNodePosRange || preNodePosRange.length === 0))) && !preNode.used && first.ccid);
             setObjEnable($('#cut'), valid);
             setObjEnable($('#paste'), valid);
         },

+ 2 - 2
app/service/change_ledger.js

@@ -77,7 +77,7 @@ module.exports = app => {
             const cBills = await this.db.get(this.tableName, this.getCondition({mid: mid, kid: kid}));
             // 判断父节点是否是变更新建的
             const parentBills = await this.db.get(this.tableName, this.getCondition({
-                mid: cBills[this.setting.pid], kid: kid,
+                mid: mid, kid: cBills[this.setting.pid],
             }));
             this.newBills = parentBills !== null && parentBills !== undefined;
             return cBills;
@@ -524,7 +524,7 @@ module.exports = app => {
                 }
                 // 选中节点--父节点 只有一个子节点时,应升级is_leaf
                 if (parent && childCount === count) {
-                    const updateParent = {id: parent.id };
+                    const updateParent = { id: parent.id };
                     updateParent[this.setting.isLeaf] = true;
                     await this.transaction.update(this.tableName, updateParent);
                 }