|
@@ -304,7 +304,7 @@ $(document).ready(() => {
|
|
|
setObjEnable($('a[name=base-opr][type=down-move]'), valid && first && sameParent && first.level > 1 && !tree.isLastSibling(last));
|
|
|
const posRange = last ? pos.getLedgerPos(last.id) : [];
|
|
|
setObjEnable($('a[name=base-opr][type=up-level]'), valid && first && sameParent && tree.getParent(first)
|
|
|
- && first.level > 2 && ((!posRange || posRange.length === 0) || tree.isLastSibling(last)) && last.settle_status !== settleStatus.finish);
|
|
|
+ && first.level > 2 && ((!posRange || posRange.length === 0) || tree.isLastSibling(last)) && (last.settle_status !== settleStatus.finish || tree.isLastSibling(last)));
|
|
|
const preNodePosRange = preNode ? pos.getLedgerPos(preNode.id) : [];
|
|
|
setObjEnable($('a[name=base-opr][type=down-level]'), valid && first && sameParent
|
|
|
&& first.level > 1 && preNode && (!preNodePosRange || preNodePosRange.length === 0) && !preNode.used && preNode.settle_status !== settleStatus.finish);
|
|
@@ -414,7 +414,7 @@ $(document).ready(() => {
|
|
|
toastr.warning('选中的节点已计量,不可升级');
|
|
|
return;
|
|
|
}
|
|
|
- if (lastSelect.settle_status === settleStatus.finish) {
|
|
|
+ if (lastSelect.settle_status === settleStatus.finish && (children.length > index + count)) {
|
|
|
toastr.warning('选中的节点已结算,不可升级');
|
|
|
return;
|
|
|
}
|