计算式引入scMathUtil

modules/reports/rpt_component/jpc_rte.js

@@ -1,10 +1,12 @@
 /**
  * Created by Tony on 2016/12/28.
  */
-let strUtil = require('../../../public/stringUtil');
-let JV = require('./jpc_value_define');
-let JE = {
+const strUtil = require('../../../public/stringUtil');
+const scMathUtil = require('../../../public/scMathUtil').getUtil();
+const JV = require('./jpc_value_define');
+const JE = {
     $STR_UTIL: strUtil,
+    $SC_MATH_UTIL: scMathUtil,
     F: function(fID, $CURRENT_RPT) {
         let rst = null;
         if ($CURRENT_RPT && ($CURRENT_RPT.fields[JV.NODE_DETAIL_FIELDS][JV.PROP_ID + "_" + fID])) {

test/unit/reports/test_rpt_test_template.js

@@ -73,6 +73,7 @@ let userId_Leng = "5c3ffa9aa0a92732f41216e0"; //小冷User Id (养护的)
 // demoPrjId = 618; //PROD:
 // demoPrjId = 2580; //PROD:
 // demoPrjId = 815; //PROD:
+// demoPrjId = 20690;
 demoPrjId = 21767;
 // demoPrjId = 738; //UAT:
 // demoPrjId = 670; //UAT: 清单项目
@@ -117,7 +118,7 @@ test('测试 - 测试模板啦: ', function (t) {
                 try {
                     let dt = new Date();
                     console.log('取完项目数据时间：' + (dt));
-                    // fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/YangHuCost/tmp/rptTplRawDataObject_测试模板.jsp");
+                    fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/YangHuCost/tmp/rptTplRawDataObject_测试模板.jsp");
                     let tplData = rptDataUtil.assembleData(rawDataObj);
                     // fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/YangHuCost/tmp/rptTplRawDataAfterCacl_测试模板.jsp");
                     // fsUtil.writeObjToFile(tplData, "D:/GitHome/YangHuCost/tmp/rptTplAssembledData_测试模板.jsp");