报表，弹窗问题

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);
+                await this.layout('report/index.ejs', renderData, 'report/rpt_margins.ejs');
             } catch (err) {
                 this.log(err);
                 console.log(err);

app/view/report/index.ejs

@@ -129,10 +129,7 @@
         </div>
     </div>
 </div>
-<<<<<<< HEAD
 <!--1弹出纸张页边距-->
-<%include ./rpt_margins.html %>
-=======
 <script src="/public/js/sub_menu.js"></script>
 <script>
     $.subMenu({
@@ -151,7 +148,6 @@
         }
     });
 </script>
->>>>>>> 7f7a3213d57fc78c74b4fbde9bb82f387fc7ac03
 
 <script type="text/javascript">  autoFlashHeight();</script>
 <!-- zTree -->