Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/service/jpc_report.js

@@ -197,7 +197,7 @@ module.exports = app => {
                     printCom.initialize(rptTpl);
                     // console.log(rptTpl);
                     const dftSplitArchives = [];
-                    if (params.splitArchives[tplIdx]) {
+                    if (params.splitArchives && params.splitArchives[tplIdx]) {
                         dftSplitArchives.push(params.splitArchives[tplIdx]);
                     }
                     // printCom.analyzeData(ctx.helper, rptTpl, tplData, defProperties, dftOption, outputType, customSelect, params.splitArchives);

app/view/report/index.ejs

@@ -347,17 +347,17 @@
 <script type="text/javascript" src="/public/js/storageUtil.js"></script>
 
 <script type="text/javascript" src="/public/report/js/rpt_public.js"></script>
-<script type="text/javascript" src="/public/report/js/rpt_main.js"></script>
-<script type="text/javascript" src="/public/report/js/rpt_archive.js"></script>
+<script type="text/javascript" src="/public/report/js/rpt_main.js?20231217"></script>
+<script type="text/javascript" src="/public/report/js/rpt_archive.js?20231217"></script>
 <script type="text/javascript" src="/public/report/js/rpt_cfg_const.js"></script>
 <script type="text/javascript" src="/public/report/js/jpc_output_value_define.js"></script>
 <script type="text/javascript" src="/public/report/js/rpt_figure.js"></script>
 <script type="text/javascript" src="/public/report/js/jpc_output.js"></script>
-<script type="text/javascript" src="/public/report/js/rpt_print.js"></script>
+<script type="text/javascript" src="/public/report/js/rpt_print.js?20231217"></script>
 <script type="text/javascript" src="/public/report/js/rpt_signature.js?20231024"></script>
-<script type="text/javascript" src="/public/report/js/rpt_jspdf.js"></script>
-<script type="text/javascript" src="/public/report/js/rpt_jsexcel.js"></script>
-<script type="text/javascript" src="/public/report/js/rpt_indexDb.js"></script>
+<script type="text/javascript" src="/public/report/js/rpt_jspdf.js?20231217"></script>
+<script type="text/javascript" src="/public/report/js/rpt_jsexcel.js?20231217"></script>
+<script type="text/javascript" src="/public/report/js/rpt_indexDb.js?20231217"></script>
 <script type="text/javascript" src="/public/report/js/rpt_move_signature.js"></script>
 <!--
 <script type="text/javascript" src="/public/report/js/rpt_custom.js"></script>