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

app/reports/rpt_component/jpc_flow_tab.js

@@ -1361,6 +1361,8 @@ JpcFlowTabSrv.prototype.createNew = function() {
     };
     JpcFlowTabResult.checkCombineEvent = function($RUN_TYPE, $VER_COMB_ARRAY, $HOR_COMB_ARRAY, $CURRENT_CELL_ITEMS, $CURRENT_RPT, $CURRENT_DATA) {
         if ($CURRENT_RPT.formulas) {
+            const $JE = JE;
+            const $JV = JV;
             for (let execFmlIdx = 0; execFmlIdx < $CURRENT_RPT.formulas.length; execFmlIdx++) {
                 if ($CURRENT_RPT.formulas[execFmlIdx][JV.PROP_RUN_TYPE] === $RUN_TYPE) {
                     const expression = $CURRENT_RPT.formulas[execFmlIdx][JV.PROP_EXPRESSION];