TonyKang 6 роки тому
батько
коміт
7aac58e8f4

+ 8 - 2
test/unit/reports/test_rpt_test_template.js

@@ -35,7 +35,7 @@ let demoPrjId = - 1;
 // let demoRptId = 450; //09
 // let demoRptId = 450; //09
 // let demoRptId = 704; //05
 // let demoRptId = 704; //05
 // let demoRptId = 626; //06
 // let demoRptId = 626; //06
-// let demoRptId = 451; //09-1
+let demoRptId = 743; //09-1
 // let demoRptId = 452; //04
 // let demoRptId = 452; //04
 // let demoRptId = 612; //09-3
 // let demoRptId = 612; //09-3
 // let demoRptId = 530; //封2
 // let demoRptId = 530; //封2
@@ -51,7 +51,7 @@ let demoPrjId = - 1;
 // let demoRptId = 931; //qa 内蒙古2017 【扉-1】招标工程量清单扉页
 // let demoRptId = 931; //qa 内蒙古2017 【扉-1】招标工程量清单扉页
 // let demoRptId = 957; //qa 内蒙古2017 12-4
 // let demoRptId = 957; //qa 内蒙古2017 12-4
 // let demoRptId = 1006; //qa 重庆2018 A03
 // let demoRptId = 1006; //qa 重庆2018 A03
-let demoRptId = 1007; //qa 重庆2018 A01
+// let demoRptId = 1007; //qa 重庆2018 A01
 // let demoRptId = 475; //计日工
 // let demoRptId = 475; //计日工
 // let demoRptId = 551; //表05
 // let demoRptId = 551; //表05
 let pagesize = "A4";
 let pagesize = "A4";
@@ -94,6 +94,12 @@ test('测试 - 测试模板啦: ', function (t) {
     rptTplFacade.getRptTemplate(demoRptId).then(function(rptTpl) {
     rptTplFacade.getRptTemplate(demoRptId).then(function(rptTpl) {
         let rptDataUtil = new rptDataExtractor();
         let rptDataUtil = new rptDataExtractor();
         rptDataUtil.initialize(rptTpl._doc);
         rptDataUtil.initialize(rptTpl._doc);
+
+        // fsUtil.writeObjToFile(rptTpl._doc, "D:/GitHome/建筑造价支持文件/报表模板/重庆市2018建筑工程_【表-09-4】施工技术措施项目清单计价表_招投标1.js");
+        // t.pass('pass : only save the template!');
+        // t.end();
+        // return;
+
         let filter = rptDataUtil.getDataRequestFilter();
         let filter = rptDataUtil.getDataRequestFilter();
         // console.log(filter);
         // console.log(filter);
         //正常应该根据报表模板定义的数据类型来请求数据
         //正常应该根据报表模板定义的数据类型来请求数据

+ 1 - 1
web/building_saas/main/html/main.html

@@ -2204,6 +2204,7 @@
     <script src="/lib/lz-string/lz-string.min.js"></script>
     <script src="/lib/lz-string/lz-string.min.js"></script>
     <script src="/lib/fileSaver/FileSaver.min.js"></script>
     <script src="/lib/fileSaver/FileSaver.min.js"></script>
     <script src="/lib/js-zip/jszip.min.js"></script>
     <script src="/lib/js-zip/jszip.min.js"></script>
+    <script type="text/javascript" src="/lib/jspdf/jspdf.min.js"></script>
     <!-- inject:js -->
     <!-- inject:js -->
     <!--<script type="text/javascript" src="/test/tmp_data/test_ration_calc/ration_calc_base.js"></script>-->
     <!--<script type="text/javascript" src="/test/tmp_data/test_ration_calc/ration_calc_base.js"></script>-->
     <script type="text/javascript" src="/web/building_saas/main/js/models/main_consts.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/models/main_consts.js"></script>
@@ -2334,7 +2335,6 @@
     <script type="text/javascript" src="/web/building_saas/main/js/views/locate_view.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/views/locate_view.js"></script>
     <script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/main.js"></script>
     <script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/main.js"></script>
     <script type="text/javascript" src="/public/web/storageUtil.js"></script>
     <script type="text/javascript" src="/public/web/storageUtil.js"></script>
-    <script type="text/javascript" src="/lib/jspdf/jspdf.min.js"></script>
     <script type="text/javascript" src="/web/building_saas/report/js/rpt_jspdf.js"></script>
     <script type="text/javascript" src="/web/building_saas/report/js/rpt_jspdf.js"></script>
     <!-- endinject -->
     <!-- endinject -->