Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/service/phase_pay_detail.js

@@ -249,7 +249,7 @@ class PayCalculator {
     }
     _calculateSf(sf, pays) {
         if (sf.expr) {
-            sf.tp = this.ctx.helper.round(this._calculateExpr(sf.expr, pays), this.decimal);
+            sf.tp = this.ctx.helper.round(this._calculateTpExpr(sf, pays), this.decimal);
         } else {
             const yf = pays.find(x => { return x.pay_type === payType.bqyf; });
             sf.tp = yf.tp;