变更增加输出报表页

app/public/css/main.css

@@ -1198,7 +1198,7 @@ legend {
   font-size:24px;
 }
 .min-side {
-  padding-bottom:5px;
+  /*padding-bottom:5px;*/
 }
 .min-side .side-fold{
  bottom:10px;

app/router.js

@@ -532,6 +532,7 @@ module.exports = app => {
     // 变更令 - 新版本
     app.get('/tender/:id/change/:cid/info', sessionAuth, tenderCheck, uncheckTenderCheck, changeCheck, changeAuditCheck, 'changeController.information');// 针对旧数据wap端跳转web问题
     app.get('/tender/:id/change/:cid/information', sessionAuth, tenderCheck, uncheckTenderCheck, changeCheck, changeAuditCheck, 'changeController.information');
+    app.get('/tender/:id/change/:cid/information/report', sessionAuth, tenderCheck, uncheckTenderCheck, changeCheck, changeAuditCheck, 'changeController.report');
     app.post('/tender/:id/change/:cid/information/save', sessionAuth, tenderCheck, uncheckTenderCheck, changeCheck, 'changeController.saveListsData');
     app.post('/tender/:id/change/:cid/information/audit/start', sessionAuth, tenderCheck, uncheckTenderCheck, changeCheck, changeAuditCheck, 'changeController.startAudit');
     app.post('/tender/:id/change/:cid/information/file/upload', sessionAuth, 'changeController.uploadFile');

app/view/change/information.ejs

@@ -5,74 +5,12 @@
             <% include ../tender/tender_sub_mini_menu.ejs %>
             <div style="width: 100%">
                 <div id="left-header" class="d-inline-block" style="min-width: 203px;">
-                <% if(auditStatus === 1 || auditStatus === 2 || auditStatus === 9) { %>
-                    <div class="d-inline-block mr-3">
-                        <a class="btn btn-sm btn-primary" href="#add-bj" data-toggle="modal" data-target="#add-bj">拷贝其他变更令数据</a>
-                    </div>
-                <% } %>
-                <div class="d-inline-block">
-                    <div class="custom-control custom-checkbox" style="line-height: normal;">
-                        <input type="checkbox" class="custom-control-input change-detail-checkbox" id="customCheck1">
-                        <label class="custom-control-label" for="customCheck1">变更详情</label>
-                    </div>
-                </div>
-                <% if (auditStatus === 3 || auditStatus === 4 || auditStatus === 5 || auditStatus === 7 || auditStatus === 8) { %>
-                    <div class="d-inline-block ml-3">
-                        <div class="custom-control custom-checkbox" style="line-height: normal;">
-                            <input type="checkbox" class="custom-control-input" id="show-table-detail">
-                            <label class="custom-control-label" for="show-table-detail">审批过程</label>
-                        </div>
-                    </div>
-                <% } %>
-                </div>
-                <% if (auditStatus === 1 || auditStatus === 2 || auditStatus === 9) { %>
-                    <div class="d-inline-block ml-1">
-                        <a href="#addlist" data-toggle="modal" class="btn btn-sm btn-light text-primary" id="open-list-modal" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="添加清单"><i class="fa fa-plus" aria-hidden="true"></i> <span class="order_text"><% if (change.order_by === 0) { %>添加<% } else { %>插入<% } %></span>台账清单</a>
-                    </div>
-                    <% if (ctx.session.sessionProject.page_show.openChangeWhiteList) { %>
-                    <div class="d-inline-block mr-1">
-                        <a href="javascript:void(0);" class="btn btn-sm btn-light text-primary" id="add-white-btn" data-original-title="添加清单"><i class="fa fa-plus" aria-hidden="true"></i> <span class="order_text"><% if (change.order_by === 0) { %>添加<% } else { %>插入<% } %></span>空白清单</a>
-                    </div>
-                    <% } %>
-                    <div class="d-inline-block mr-2">
-                        <button type="button" class="btn btn-sm btn-light text-primary dropdown-toggle" data-toggle="dropdown" id="bpaixu">清单排序：<% if (change.order_by === 0) { %>清单编号<% } else { %>添加顺序<% } %></button>
-                        <div class="dropdown-menu" aria-labelledby="bpaixu">
-                            <ul class="list-unstyled px-3 mb-0">
-                                <li class="mb-2">
-                                    <div class="custom-control custom-radio">
-                                        <input type="radio" class="custom-control-input" name="paixu" id="order_0" value="0" <% if (change.order_by === 0) { %>checked<% } %>>
-                                        <label class="custom-control-label" for="order_0">清单编号</label>
-                                    </div>
-                                </li>
-                                <li class="mb-2">
-                                    <div class="custom-control custom-radio">
-                                        <input type="radio" class="custom-control-input" name="paixu" id="order_1" value="1" <% if (change.order_by === 1) { %>checked<% } %>>
-                                        <label class="custom-control-label" for="order_1">添加顺序</label>
-                                    </div>
-                                </li>
-                            </ul>
+                    <div class="d-inline-block">
+                        <div class="btn-group btn-group-toggle group-tab">
+                            <a class="btn btn-sm btn-light active" href="javascript:void(0);">变更详情</a>
+                            <a class="btn btn-sm btn-light" href="/tender/<%- ctx.tender.id %>/change/<%- ctx.change.cid %>/information/report">输出报表</a>
                         </div>
                     </div>
-                    <div class="d-inline-block mr-2" id="upAndMoveBtn" <% if (change.order_by === 0) { %>style="display: none!important;" <% } %>>
-                        <a href="javascript:void(0)" id="up-move" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
-                        <a href="javascript:void(0)" id="down-move" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
-                    </div>
-                <% } %>
-                <% if (showPlanBtn) { %>
-                <div class="d-inline-block mr-2">
-                    <a class="btn btn-sm btn-primary" href="#bgfadb" data-toggle="modal" data-target="#bgfadb">差值对比</a>
-                </div>
-                <% } %>
-                <div class="d-inline-block mr-2">
-                    <a class="btn btn-sm btn-primary" href="#qdgather" data-toggle="modal" data-target="#qdgather">清单汇总</a>
-                </div>
-                <div class="d-inline-block mr-2">
-                    <div class="input-group input-group-sm">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text" id="basic-addon1">表达式</span>
-                        </div>
-                        <input type="text" class="form-control form-control-sm m-0" id="camount-expr" readonly="readOnly" autocomplete="off">
-                    </div>
                 </div>
                 <div class="pull-right mr-3" id="sp-btn">
                     <% if (ctx.change.cancancel) { %>
@@ -137,6 +75,11 @@
                         <li class="nav-item">
                             <a class="nav-link" data-toggle="tab" data-tab="bgfujian" href="#bgfujian" role="tab">附件</a>
                         </li>
+                        <li class="nav-item ml-auto pt-1 mr-3" id="copy_btn">
+                            <% if(auditStatus === 1 || auditStatus === 2 || auditStatus === 9) { %>
+                                <a class="btn btn-sm btn-primary" href="#add-bj" data-toggle="modal" data-target="#add-bj">拷贝其他变更令数据</a>
+                            <% } %>
+                        </li>
                         <li class="nav-item ml-auto pt-1" id="fujian_btn" style="display:none;">
                             <!--所有附件 翻页-->
                             <button  data-toggle="modal" class="btn btn-sm btn-primary" id="bach-download"><i class="fa fa-download "></i> 批量下载</button>
@@ -438,7 +381,76 @@
             </div>
             <div class="c-body" id="right-view" style="width: 66.67%">
                 <div class="resize-x" id="right-spr" r-Type="width" div1="#left-view" div2="#right-view" title="调整大小" a-type="percent"><!--调整左右高度条--></div>
-                <div class="sjs-height-1" id="change-spread">
+                <!--上半部分-->
+                <div class="sjs-height-1 row w-100 sub-content">
+                    <div class="c-body" style="width: 100%">
+                        <div class="m-1" id="list-tab">
+                            <% if (auditStatus === 1 || auditStatus === 2 || auditStatus === 9) { %>
+                                <div class="d-inline-block ml-1">
+                                    <a href="#addlist" data-toggle="modal" class="btn btn-sm btn-light text-primary" id="open-list-modal" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="添加清单"><i class="fa fa-plus" aria-hidden="true"></i> <span class="order_text"><% if (change.order_by === 0) { %>添加<% } else { %>插入<% } %></span>台账清单</a>
+                                </div>
+                                <% if (ctx.session.sessionProject.page_show.openChangeWhiteList) { %>
+                                    <div class="d-inline-block mr-1">
+                                        <a href="javascript:void(0);" class="btn btn-sm btn-light text-primary" id="add-white-btn" data-original-title="添加清单"><i class="fa fa-plus" aria-hidden="true"></i> <span class="order_text"><% if (change.order_by === 0) { %>添加<% } else { %>插入<% } %></span>空白清单</a>
+                                    </div>
+                                <% } %>
+                                <div class="d-inline-block mr-2">
+                                    <button type="button" class="btn btn-sm btn-light text-primary dropdown-toggle" data-toggle="dropdown" id="bpaixu">清单排序：<% if (change.order_by === 0) { %>清单编号<% } else { %>添加顺序<% } %></button>
+                                    <div class="dropdown-menu" aria-labelledby="bpaixu">
+                                        <ul class="list-unstyled px-3 mb-0">
+                                            <li class="mb-2">
+                                                <div class="custom-control custom-radio">
+                                                    <input type="radio" class="custom-control-input" name="paixu" id="order_0" value="0" <% if (change.order_by === 0) { %>checked<% } %>>
+                                                    <label class="custom-control-label" for="order_0">清单编号</label>
+                                                </div>
+                                            </li>
+                                            <li class="mb-2">
+                                                <div class="custom-control custom-radio">
+                                                    <input type="radio" class="custom-control-input" name="paixu" id="order_1" value="1" <% if (change.order_by === 1) { %>checked<% } %>>
+                                                    <label class="custom-control-label" for="order_1">添加顺序</label>
+                                                </div>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                </div>
+                                <div class="d-inline-block mr-2" id="upAndMoveBtn" <% if (change.order_by === 0) { %>style="display: none!important;" <% } %>>
+                                    <a href="javascript:void(0)" id="up-move" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
+                                    <a href="javascript:void(0)" id="down-move" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
+                                </div>
+                            <% } %>
+                            <div class="d-inline-block mr-2">
+                                <div class="custom-control custom-checkbox">
+                                    <input type="checkbox" class="custom-control-input change-detail-checkbox" id="customCheck1">
+                                    <label class="custom-control-label" for="customCheck1">变更详情</label>
+                                </div>
+                            </div>
+                            <% if (auditStatus === 3 || auditStatus === 4 || auditStatus === 5 || auditStatus === 7 || auditStatus === 8) { %>
+                                <div class="d-inline-block mr-2">
+                                    <div class="custom-control custom-checkbox">
+                                        <input type="checkbox" class="custom-control-input" id="show-table-detail">
+                                        <label class="custom-control-label" for="show-table-detail">审批过程</label>
+                                    </div>
+                                </div>
+                            <% } %>
+                            <% if (showPlanBtn) { %>
+                                <div class="d-inline-block mr-2">
+                                    <a class="btn btn-sm btn-primary" href="#bgfadb" data-toggle="modal" data-target="#bgfadb">差值对比</a>
+                                </div>
+                            <% } %>
+                            <div class="d-inline-block mr-2">
+                                <a class="btn btn-sm btn-primary" href="#qdgather" data-toggle="modal" data-target="#qdgather">清单汇总</a>
+                            </div>
+                            <div class="d-inline-block mr-2">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text" id="basic-addon1">表达式</span>
+                                    </div>
+                                    <input type="text" class="form-control form-control-sm m-0" id="camount-expr" readonly="readOnly" autocomplete="off">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="sjs-height-change" id="change-spread"></div>
+                    </div>
                 </div>
                 <!--下半部分-->
                 <div class="bcontent-wrap">

app/view/change/report.ejs

@@ -0,0 +1,202 @@
+<% include ../tender/tender_sub_menu.ejs %>
+<div class="panel-content">
+    <div class="panel-title" style="padding-right: 0px"><!--收起详解目录添加类名 fluid -->
+        <div class="title-main d-flex"><!--工具-->
+            <% include ../tender/tender_sub_mini_menu.ejs %>
+            <div style="width: 100%">
+                <div id="left-header" class="d-inline-block" style="min-width: 203px;">
+                    <div class="d-inline-block">
+                        <div class="btn-group btn-group-toggle group-tab">
+                            <a class="btn btn-sm btn-light" href="/tender/<%- ctx.tender.id %>/change/<%- ctx.change.cid %>/information">变更详情</a>
+                            <a class="btn btn-sm btn-light active" href="javascript:void(0);">输出报表</a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="content-wrap">
+        <div class="c-header p-0"></div>
+        <div class="w-100 sub-content row">
+            <div class="c-body col-3">
+                <div class="d-inline-block">
+                    <ul class="nav nav-pills m-0">
+                        <li class="nav-item mr-1"><a href="#man-c" data-toggle="modal" data-target="#man-c" class=" btn btn-light btn-sm text-primary"><i class="fa fa-cog"></i> 通用报表</a></li>
+                        <li class="nav-item"><a href="#add-c" data-toggle="modal" data-target="#add-c" class=" btn btn-light btn-sm  text-primary"><i class="fa fa-plus"></i> 定制报表</a></li>
+                    </ul>
+                </div>
+                <div class="sjs-height-1">
+                    <div class="text-center"></div>
+                    <ul id="treeDemo2" class="ztree"></ul>
+                </div>
+            </div>
+            <div class="c-body col-9">
+                <!--调整侧栏宽度-->
+                <div class="resize-x" title="调整大小"></div>
+
+                <!--打印工具栏-->
+                <div class="toolsbar-f d-flex justify-content-between">
+                    <div class="print-toolsbar">
+                        <div class="panel">
+                            <div class="panel-body">
+                                <div class="btn-group" role="group">
+                                    <button class="btn btn-outline-primary btn-sm" type="button">
+                                        <i class="fa fa-print"></i><br>
+                                        打印 <span class="badge badge-primary">5</span>
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="panel">
+                            <div class="panel-body">
+                                <div class="btn-group" role="group" aria-label="Button group with nested dropdown">
+                                    <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="modal" data-target="#export" disabled=""><i class="fa fa-file-excel-o"></i> Excel <span class="badge badge-primary">5</span></button>
+                                    <button type="button" class="btn btn-outline-primary btn-sm"><i class="fa fa-file-pdf-o"></i> PDF <span class="badge badge-primary">5</span></button>
+                                </div>
+                            </div>
+                            <div class="panel-foot text-muted">
+                                导出报表
+                            </div>
+                        </div>
+                        <div class="panel">
+                            <div class="panel-body">
+                                <div class="btn-group" role="group">
+                                    <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="modal" data-target="#guidang"><i class="fa fa-archive"></i> 归档报表</button>
+
+                                    <div class="btn-group" role="group">
+                                        <button id="btnGroupDrop1" type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                            已归档
+                                        </button>
+                                        <div class="dropdown-menu" aria-labelledby="btnGroupDrop1" style="min-width:112px">
+                                            <a class="dropdown-item" href="#">#1 2021-03-01</a>
+                                            <a class="dropdown-item" href="#">#2 2021-02-28</a>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="panel-foot text-muted">
+                                报表归档
+                            </div>
+                        </div>
+                        <div class="panel">
+                            <div class="panel-body">
+                                <div class="btn-group" role="group">
+                                    <div class="btn-group" role="group">
+                                        <button id="btnGroupDrop1" type="button" class="btn btn-outline-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                            纵向
+                                        </button>
+                                        <div class="dropdown-menu" aria-labelledby="btnGroupDrop1" style="min-width:112px">
+                                            <a class="dropdown-item" href="#">横向</a>
+                                        </div>
+                                    </div>
+                                    <div class="btn-group" role="group">
+                                        <button id="btnGroupDrop1" type="button" class="btn btn-outline-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                            A4
+                                        </button>
+                                        <div class="dropdown-menu" aria-labelledby="btnGroupDrop1" style="min-width:112px">
+                                            <a class="dropdown-item" href="#">A3</a>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="panel-foot text-muted">
+                                预览设置
+                            </div>
+                        </div>
+                        <div class="panel">
+                            <div class="panel-body">
+                                <div class="btn-group" role="group">
+                                    <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="tooltip" data-placement="bottom" title="缩小">-</button>
+                                    <button class="btn btn-outline-primary btn-sm" data-toggle="tooltip" data-placement="bottom" title="重置默认大小">1000%</button>
+                                    <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="tooltip" data-placement="bottom" title="放大">+</button>
+                                </div>
+                            </div>
+                            <div class="panel-foot text-muted">
+                                缩放
+                            </div>
+                        </div>
+                        <div class="panel">
+                            <div class="panel-body">
+                                <div class="btn-group" role="group">
+                                    <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="modal" data-target="#paper"><i class="fa fa-file-o"></i> 页边距</button>
+                                    <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="modal" data-target="#format"><i class="fa fa-bold"></i> 格式</button>
+                                    <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="modal" data-target="#setting"><i class="fa fa-cog"></i> 设置</button>
+                                </div>
+                            </div>
+                            <div class="panel-foot text-muted">
+                                报表设置
+                            </div>
+                        </div>
+                        <div class="panel">
+                            <div class="panel-body">
+                                <div class="btn-group" role="group">
+                                    <button class="btn btn-outline-primary btn-sm" type="button" data-toggle="modal" data-target="#sign">
+                                        <i class="fa fa-pencil"></i><br>
+                                        签字
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="panel">
+                            <div class="panel-body">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-prepend">
+                                        <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="tooltip" data-placement="bottom" title="第一页"><i class="fa fa-angle-double-left "></i></button>
+                                        <button type="button" class="btn btn-outline-primary btn-sm" disabled data-toggle="tooltip" data-placement="bottom" title="上一页"><i class="fa fa-angle-left "></i></button>
+                                    </div>
+                                    <input class="form-control" value="1/10" style="width:60px"  data-toggle="tooltip" data-placement="bottom" title="输入页码按回车键，快速跳转">
+                                    <div class="input-group-append">
+                                        <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="tooltip" data-placement="bottom" title="下一页"><i class="fa fa-angle-right"></i></button>
+                                        <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="tooltip" data-placement="bottom" title="尾页"><i class="fa fa-angle-double-right "></i></button>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="panel-foot text-muted">
+                                翻页
+                            </div>
+                        </div>
+                        <!--用于报表带工具栏全屏显示 -->
+                        <div class="panel">
+                            <div class="panel-body">
+                                <div class="btn-group" role="group">
+                                    <button class="btn btn-outline-primary btn-sm" type="button" data-toggle="modal" data-target="#fullscreen">
+                                        <i class="fa fa-window-maximize"></i><br>
+                                        全屏显示
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="sjs-height-4">
+                    <div class="print-view form-view">
+                        <div class="pageContainer">
+                            <div class="page">
+                                <img src="img/2 中期支付证书(佛山禅城).png">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+    autoFlashHeight();
+    $.subMenu({
+        menu: '#sub-menu', miniMenu: '#sub-mini-menu', miniMenuList: '#mini-menu-list',
+        toMenu: '#to-menu', toMiniMenu: '#to-mini-menu',
+        key: 'menu.1.0.0',
+        miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1',
+        callback: function (info) {
+            if (info.mini) {
+                $('.panel-title').addClass('fluid');
+                $('#sub-menu').removeClass('panel-sidebar');
+            } else {
+                $('.panel-title').removeClass('fluid');
+                $('#sub-menu').addClass('panel-sidebar');
+            }
+            autoFlashHeight();
+        }
+    });
+</script>