|
|
@@ -1,9 +1,10 @@
|
|
|
+// 计算式执行(不同情况的方法会不同)
|
|
|
import JE from './jpc_rte';
|
|
|
import formulasDataSetter from './formulasDataSetter';
|
|
|
import stringUtil from '../public/stringUtil'
|
|
|
import useReportDate from '../public/ReportDate'
|
|
|
import { ICurrent_RPT, IRptTpl, IDataObj, Fields } from '../interface/basic'
|
|
|
-
|
|
|
+import $JV from './jpc_value_define';
|
|
|
|
|
|
export const formulaExec = (runType: string, $CURRENT_TEMPLATE: IRptTpl, $CURRENT_DATA: IDataObj, $CURRENT_RPT: ICurrent_RPT) => {
|
|
|
formulasDataSetter.setupData($CURRENT_RPT, $CURRENT_DATA);
|
|
|
@@ -38,6 +39,7 @@ export const formulaExec = (runType: string, $CURRENT_TEMPLATE: IRptTpl, $CURREN
|
|
|
formatNumber,
|
|
|
} = stringUtil;
|
|
|
const $JE = JE;
|
|
|
+ const JV= $JV;
|
|
|
const ReportDate = useReportDate;
|
|
|
for (let execFmlIdx = 0; execFmlIdx < $CURRENT_RPT.formulas.length; execFmlIdx++) {
|
|
|
if ($CURRENT_RPT.formulas[execFmlIdx].run_type === runType) {
|