小数位数 - 项目人材机数量计算

modules/reports/util/rpt_construct_data_util.js

@@ -222,8 +222,9 @@ class Rpt_Data_Extractor {
         let rationGLJDatas = getModuleDataByKey(rawDataObj.prjData, "ration_glj");
         let rationDatas = getModuleDataByKey(rawDataObj.prjData, "ration");
         let billsDatas = getModuleDataByKey(rawDataObj.prjData, "bills");
+        let decimal = rawDataObj.prj.property.decimal.glj.quantity;
         if (projectGLJDatas && rationGLJDatas && rationDatas && billsDatas) {
-            gljUtil.calcProjectGLJQuantity(projectGLJDatas.data, rationGLJDatas.data, rationDatas.data, billsDatas.data, 4);
+            gljUtil.calcProjectGLJQuantity(projectGLJDatas.data, rationGLJDatas.data, rationDatas.data, billsDatas.data, decimal);
         }
 
         if (tpl[JV.NODE_MAP_DATA_HANDLE_INFO]) {

test/unit/reports/rpt_cfg.js

@@ -286,6 +286,15 @@ module.exports = {
             "Wrap" : "false"
         },
         {
+            "ID": "Header_Right",
+            "CfgDispName": "表头_右",
+            "Shrink": "F",
+            "ShowZero": "T",
+            "Horizon": "right",
+            "Vertical": "center",
+            "Wrap": "F"
+        },
+        {
             "ID" : "Footer",
             "CfgDispName" : "表尾",
             "Shrink" : "T",

test/unit/reports/test_rpt_test_template.js

@@ -27,7 +27,8 @@ let fsUtil = require("../../../public/fsUtil");
 
 let demoPrjId = - 1;
 // let demoRptId = 279;
-let demoRptId = 275; //测试模板-流水式
+// let demoRptId = 275; //测试模板-流水式
+let demoRptId = 337; //19表
 let pagesize = "A4";
 //288: 11-2表(新)
 //279: 04
@@ -66,7 +67,7 @@ test('测试 - 测试模板啦: ', function (t) {
                 try {
                     // fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/ConstructionCost/tmp/rptTplRawDataObject_测试模板.jsp");
                     let tplData = rptDataUtil.assembleData(rawDataObj);
-                    // fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/ConstructionCost/tmp/rptTplRawDataAfterCacl_测试模板.jsp");
+                    fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/ConstructionCost/tmp/rptTplRawDataAfterCacl_测试模板.jsp");
                     // fsUtil.writeObjToFile(tplData, "D:/GitHome/ConstructionCost/tmp/rptTplAssembledData_测试模板.jsp");
                     //it's time to build the report!!!
                     let printCom = JpcEx.createNew();