表21-2 量材数据完整显示

modules/reports/util/rpt_yanghu_data_util.js

@@ -857,10 +857,11 @@ function moveRationData(rationData, rawDataObj) {
                     copyItem.projectGLJID = dummyPRJID;
                     dummyPrjItem.id = dummyPRJID;
                     dummyPRJID++;
+                    dummyPrjItem.name = rationItem.name;
                     dummyPrjItem.unit_price = {};
                     dummyPrjItem.unit_price.base_price = 0;
                     dummyPrjItem.unit_price.market_price = (rationItem["marketUnitFee"])?rationItem["marketUnitFee"]:0;
-                    dummyPrjItem.quantity = 0;
+                    dummyPrjItem.quantity = 1; //这里设置为1只是为了不被误过滤
                     dummyPrjItem.is_evaluate = 0;
                     prjGljData.data.gljList.push(dummyPrjItem);
                 }

test/unit/reports/test_rpt_test_template.js

@@ -66,13 +66,13 @@ let userId_Leng = "5c3ffa9aa0a92732f41216e0"; //小冷User Id (养护的)
 // demoPrjId = 2056; //UAT
 // demoPrjId = 815; //UAT
 // demoPrjId = 1516; //PROD:
-// demoPrjId = 452; //PROD:
-demoPrjId = 2580; //PROD:
+demoPrjId = 618; //PROD:
+// demoPrjId = 2580; //PROD:
 // demoPrjId = 815; //PROD:
 // demoPrjId = 4107; //UAT:
 //*/
 let userId_Dft = userId_Leng;
-userId_Dft = '5c641205950967000d20d35b'; //临时用
+// userId_Dft = '5c641205950967000d20d35b'; //临时用
 // let userId_Dft = "5a025c4c15074d134c2b9689";
 /*/
  let userId_Dft = "595328da1934dc327cad08eb";
@@ -110,9 +110,9 @@ 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(rawDataObj, "D:/GitHome/YangHuCost/tmp/rptTplRawDataAfterCacl_测试模板.jsp");
                     // fsUtil.writeObjToFile(tplData, "D:/GitHome/YangHuCost/tmp/rptTplAssembledData_测试模板.jsp");
                     //it's time to build the report!!!
                     let printCom = JpcEx.createNew();
@@ -135,9 +135,9 @@ test('测试 - 测试模板啦: ', function (t) {
                         // rpt_xl_util.exportExcel(pageRst, pagesize, "local_test_rpt_excel", true, null, null, function(uuidName){
                         //     console.log("excel uuid: " + uuidName);
                         // });
-                        rpt_pdf_util.export_pdf_file(pageRst, pagesize, 'local_test_rpt_pdf', function(uuidName){
-                            console.log("pdf uuid: " + uuidName);
-                        });
+                        // rpt_pdf_util.export_pdf_file(pageRst, pagesize, 'local_test_rpt_pdf', function(uuidName){
+                        //     console.log("pdf uuid: " + uuidName);
+                        // });
                     } else {
                         console.log("oh! no pages were created!");
                     }