调差计算式bug

app/public/js/material.js

@@ -114,7 +114,7 @@ $(document).ready(() => {
             {title: '本期材料调差|上涨幅度（%）', colSpan: '4|1', rowSpan: '1|1', field: 'm_up_risk', hAlign: 2, width: 100, type: 'Number', readOnly: 'readOnly.isEdit'},
             {title: '|下跌幅度（%）', colSpan: '|1', rowSpan: '|1', field: 'm_down_risk', hAlign: 2, width: 100, type: 'Number', readOnly: 'readOnly.isEdit'},
             {title: '|有效价差', colSpan: '|1', rowSpan: '|1', field: 'm_spread', hAlign: 2, width: 80, type: 'Number', readOnly: true, getValue: 'getValue.m_spread'},
-            {title: '|调整金额', colSpan: '|1', rowSpan: '1|1', field: 'm_tp', hAlign: 2, width: 80, type: 'Number', readOnly: true, getValue: 'getValue.m_tp'},
+            {title: '|调差金额', colSpan: '|1', rowSpan: '1|1', field: 'm_tp', hAlign: 2, width: 80, type: 'Number', readOnly: true, getValue: 'getValue.m_tp'},
             {title: '截止上期调差金额', colSpan: '1', rowSpan: '2', field: 'pre_tp', hAlign: 2, width: 120, type: 'Number', readOnly: true},
             {title: '备注', colSpan: '1', rowSpan: '2', field: 'remark', hAlign: 0, width: 60, formatter: '@', readOnly: 'readOnly.remark'},
         ],
@@ -563,13 +563,13 @@ $(document).ready(() => {
                     } else if (/^[a-z]/.test(expr[i])) {
                         if (num !== '') {
                             param.push({type: 'num', value: num});
-                            base = '';
+                            num = '';
                         }
                         base = base + expr[i];
                     } else if (expr[i] === '(') {
                         if (num !== '') {
                             param.push({type: 'num', value: num});
-                            base = '';
+                            num = '';
                         }
                         if (base !== '') {
                             param.push({type: 'base', value: base});
@@ -579,7 +579,7 @@ $(document).ready(() => {
                     } else if (expr[i] === ')') {
                         if (num !== '') {
                             param.push({type: 'num', value: num});
-                            base = '';
+                            num = '';
                         }
                         if (base !== '') {
                             param.push({type: 'base', value: base});
@@ -589,7 +589,7 @@ $(document).ready(() => {
                     } else if (/^[\+\-*\/]/.test(expr[i])) {
                         if (num !== '') {
                             param.push({type: 'num', value: num});
-                            base = '';
+                            num = '';
                         }
                         if (base !== '') {
                             param.push({type: 'base', value: base});
@@ -602,7 +602,7 @@ $(document).ready(() => {
                 }
                 if (num !== '') {
                     param.push({type: 'num', value: num});
-                    base = '';
+                    num = '';
                 }
                 if (base !== '') {
                     param.push({type: 'base', value: base});
@@ -684,6 +684,7 @@ $(document).ready(() => {
             const [valid, msg] = ExprObj._checkExpr(expr);
             if (!valid) {
                 toastr.error(msg);
+                return false;
             }
             postData(window.location.pathname + '/save', { type:'expr', id: $('#materialbillsId').val(), expr: expr }, function (result) {
                 m_tp = result.m_tp;