|
@@ -82,7 +82,10 @@ class PayCalculator {
|
|
|
}
|
|
|
|
|
|
checkQuetoExpr(expr) {
|
|
|
- if (!this.basesReg) this.basesReg = new RegExp(this.bases.map(x => {return '(' + x.code + ')'}).join('|'));
|
|
|
+ if (!this.basesReg) {
|
|
|
+ this.getCalcBase();
|
|
|
+ this.basesReg = new RegExp(this.bases.map(x => {return '(' + x.code + ')'}).join('|'));
|
|
|
+ }
|
|
|
return this.basesReg.test(expr) || this.nodeReg.test(expr);
|
|
|
}
|
|
|
|
|
@@ -375,7 +378,7 @@ class PhasePayDetail extends TreeService {
|
|
|
pd.audit_sort = 0;
|
|
|
if (!pd.pre_used) pd.pre_used = pd.pre_tp ? 1 : 0;
|
|
|
if (!pd.pre_finished) pd.pre_finished = pd.end_tp >= pd.range_tp;
|
|
|
- if (pd.expr && (!pd.pay_type || pd.pay_type === payType.bqsf) && payCalc.checkQuetoExpr(pd.expr)) pd.expr = '';
|
|
|
+ if (pd.expr && (!pd.pay_type || pd.pay_type === payType.bqsf) && !payCalc.checkQuetoExpr(pd.expr)) pd.expr = '';
|
|
|
}
|
|
|
await conn.insert(this.tableName, preData);
|
|
|
}
|