Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/controller/report_controller.js

@@ -57,7 +57,7 @@ module.exports = app => {
                     // jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.ledger.explode),
                 };
                 // await this.layout('report/index.ejs', renderData, 'ledger/audit_modal.ejs');
-                await this.layout('report/index.ejs', renderData, 'rpt_all_popup.ejs');
+                await this.layout('report/index.ejs', renderData, 'report/rpt_all_popup.ejs');
             } catch (err) {
                 this.log(err);
                 console.log(err);