结算台账计算问题

app/lib/settle.js

@@ -119,7 +119,7 @@ class Settle {
                 sb.is_org_settle = pb.is_org_settle;
             }
         }
-        this.stageTree.initNodeData('settle_status', this.settleStatus.non, values => { return values.length === 1 ? values[0] : this.settleStatus.part});
+        // this.stageTree.initNodeData('settle_status', this.settleStatus.non, values => { return values.length === 1 ? values[0] : this.settleStatus.part});
     }
 
     calculateSettle() {
@@ -127,7 +127,7 @@ class Settle {
         const settle = this.settle;
         const settleStatus = this.settleStatus;
         this.stagePos.calculateAll(function(p) {
-            if (p.is_settle || !p.pre_settle) {
+            if (p.is_settle && !p.pre_settle) {
                 p.cur_contract_qty = p.settle_contract_qty;
                 p.cur_qc_qty = p.settle_qc_qty;
                 p.cur_qc_minus_qty = p.settle_qc_minus_qty;
@@ -171,7 +171,6 @@ class Settle {
                 b.end_qc_tp = helper.add(b.cur_qc_tp, b.pre_qc_tp);
                 b.end_qc_minus_qty = helper.add(b.cur_qc_minus_qty, b.pre_qc_minus_qty);
             }
-            //if (b.is_tp) {
             if (!b.end_contract_qty) {
                 if (helper.numEqual(b.end_contract_tp, b.total_price)) {
                     b.settle_status = settleStatus.finish;
@@ -188,6 +187,7 @@ class Settle {
                 }
             }
         });
+        this.stageTree.initNodeData('settle_status', this.settleStatus.non, values => { return values.length === 1 ? values[0] : this.settleStatus.part});
     }
 
     getSettleData() {