支付审批再推一版

app/controller/payment_controller.js

@@ -205,9 +205,11 @@ module.exports = app => {
                 const id = parseInt(ctx.params.id);
                 if (!id) throw '参数错误';
                 const info = await ctx.service.paymentDetail.getDataById(id);
-
+                const rptTpl = await ctx.service.rptTpl.getDataById(3030);
+                const pageRst = ctx.service.jpcReport.getAllPreviewPagesCommon(rptTpl, 'A4');
                 const renderData = {
                     info,
+                    pageRst,
                 };
                 await this.layout('payment/detail.ejs', renderData);
             } catch (err) {
@@ -232,6 +234,7 @@ module.exports = app => {
                         const rptTpl = await ctx.service.rptTpl.getDataById(rpt.ID);
                         // 根据模板ID获取报表JSON
                         const pageRst = ctx.service.jpcReport.getAllPreviewPagesCommon(rptTpl, 'A4');
+                        rptTplList.push(pageRst.items[0]);
                     }
                 }
                 const renderData = {
@@ -240,7 +243,7 @@ module.exports = app => {
                     rptProjectList,
                     rptTplList,
                 };
-                await this.layout('payment/process.ejs', renderData);
+                await this.layout('payment/process.ejs', renderData, 'payment/process_modal.ejs');
             } catch (err) {
                 console.log(err);
                 this.log(err);

app/view/payment/process.ejs

@@ -85,7 +85,7 @@
                         <div class="tab-pane fade" id="profile" role="tabpanel" aria-labelledby="profile-tab">
                             <div class="row">
                                 <div class="col-4">
-                                    <div class="my-3"><a href="#">添加表单</a></div>
+                                    <div class="my-3"><a href="#add-rpt" data-toggle="modal" data-target="#add-rpt">添加表单</a></div>
                                     <table class="table table-bordered">
                                         <thead>
                                         <tr>

app/view/payment/process_modal.ejs

@@ -0,0 +1,38 @@
+<div class="modal fade" id="add-rpt" data-backdrop="static">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">添加表单</h5>
+            </div>
+            <div class="modal-body">
+                <table id="rpt-table" class="table table-bordered">
+                    <thead>
+                    <tr>
+                        <th class="text-center"><input type="checkbox">选择</th>
+                        <th class="text-center">表单名</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr>
+                        <td class="text-center"><input type="checkbox"></td>
+                        <td>指挥部工程结算款</td>
+                    </tr>
+                    <tr>
+                        <td class="text-center"><input type="checkbox"></td>
+                        <td>指挥部工程结算付款</td>
+                    </tr>
+                    <tr>
+                        <td class="text-center"><input type="checkbox"></td>
+                        <td>指挥部监理、设计等预付款</td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+            <div class="modal-footer">
+                <input type="hidden" id="add_tender_folder_id" />
+                <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">取消</button>
+                <button type="button" class="btn btn-sm btn-primary" id="new_tender_btn">确定添加</button>
+            </div>
+        </div>
+    </div>
+</div>