Browse Source

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

MaiXinRong 4 years ago
parent
commit
a6bfcd1911
2 changed files with 2 additions and 0 deletions
  1. 1 0
      app/controller/report_controller.js
  2. 1 0
      app/view/report/index.ejs

+ 1 - 0
app/controller/report_controller.js

@@ -202,6 +202,7 @@ module.exports = app => {
                     materialList,
                     stages: stageList,
                     dataSelects,
+                    authMobile: accountInfo.auth_mobile,
                 };
                 await this.layout('report/index.ejs', renderData, 'report/rpt_all_popup.ejs');
                 // await this.layout('report/index.ejs', renderData);

+ 1 - 0
app/view/report/index.ejs

@@ -238,6 +238,7 @@
 <script type="text/javascript" src="/public/jspdf/jspdf.min.js"></script>
 <script src="/public/js/datepicker/datepicker.min.js"></script>
 <script src="/public/js/datepicker/datepicker.zh.js"></script>
+<script src="/public/js/shares/cs_tools.js"></script>
 
 <!-- zTree -->
 <script type="text/javascript" src="/public/js/ztree/jquery.ztree.core.js"></script>