弹出页面重新调整

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

app/view/report/rpt_all_popup.ejs

@@ -0,0 +1,191 @@
+<div class="modal fade" id="paper" data-backdrop="static">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">页边距（毫米）</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class="row mb-1 justify-content-center">
+                    <div class="col-3">
+                        <div class="input-group input-group-sm ">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text" id="basic-addon1">上</span>
+                            </div>
+                            <input type="number" class="form-control" value="12">
+                        </div>
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <div class="col-3">
+                        <div class="input-group input-group-sm ">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text" id="basic-addon2">左</span>
+                            </div>
+                            <input type="number" class="form-control" value="12">
+                        </div>
+                    </div>
+                    <div class="col-6">
+                        <h1 class="display-4 text-center"><i class="fa fa-file-o"></i></h1>
+                    </div>
+                    <div class="col-3">
+                        <div class="input-group input-group-sm ">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text" id="basic-addon3">右</span>
+                            </div>
+                            <input type="number" class="form-control" value="12">
+                        </div>
+                    </div>
+                </div>
+                <div class="row mb-1 justify-content-center">
+                    <div class="col-3">
+                        <div class="input-group input-group-sm ">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text" id="basic-addon4">下</span>
+                            </div>
+                            <input type="number" class="form-control" value="12">
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-link float-left" data-dismiss="modal">恢复默认值</button>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                <a href="" class="btn btn-primary">确定</a>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="modal fade" id="format" data-backdrop="static">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">格式</h5><h5 class="modal-title" id="update_msg_response"></h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class="row mb-1" id="font_cfg_blank_flag"></div>
+                <div class="row mb-1">
+                    <div class="col-4">
+                        <div class="form-check">
+                            <label class="form-check-label">
+                                <input id="rpt_vertical_line" type="checkbox" class="form-check-input" onchange="rptControlObj.changeCfgOption('showVerticalLine', this)">
+                                边框竖线
+                            </label>
+                        </div>
+                    </div>
+                    <div class="col-4" style="display: none">
+                        <div class="form-check">
+                            <label class="form-check-label">
+                                <input id="rpt_narrow" type="checkbox" class="form-check-input" onchange="rptControlObj.changeCfgOption('isNarrow', this)">
+                                窄体输出
+                            </label>
+                        </div>
+                    </div>
+                    <div class="col-4">
+                        <div class="form-check">
+                            <label class="form-check-label">
+                                <input id="rpt_fill_zero" type="checkbox" class="form-check-input" onchange="rptControlObj.changeCfgOption('fillZero', this)">
+                                小数补0
+                            </label>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-link float-left" onclick="rptControlObj.restoreCustCFG()">恢复默认值</button>
+                <button type="button" class="btn btn-link float-left" onclick="rptControlObj.saveCustCfg()">存为默认值</button>
+                <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="rptControlObj.confirmCfgChange()">确定</button>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="modal fade" id="export" data-backdrop="static">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">选择导出格式</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class="row">
+                    <div class="col-6">
+                        <a class="btn btn-block btn-outline-secondary" id="PDF_TYPE" onclick="rptControlObj.changeType('PDF')">
+                            <!-- <i class="fa fa-check-square pull-right"></i> -->
+                            <div class="card-body text-center">
+                                <h1 class="display-3"><i class="fa fa-file-pdf-o"></i></h1>
+                                <h1>PDF</h1>
+                            </div>
+                        </a>
+                    </div>
+                    <div class="col-6">
+                        <a class="btn btn-block btn-primary" id="EXCEL_TYPE" onclick="rptControlObj.changeType('Excel')">
+                            <!-- <i class="fa fa-check-square pull-right"></i> -->
+                            <div class="card-body text-center">
+                                <h1 class="display-3"><i class="fa fa-file-excel-o"></i></h1>
+                                <h1>Excel</h1>
+                            </div>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                <a onclick="rptControlObj.outputRpt();" class="btn btn-primary">确定</a>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="modal fade" id="export_excel" data-backdrop="static">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">批量导出Excel</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class="row">
+                    <div class="col-6">
+                        <div class="card">
+                            <img class="card-img-top" src="/web/building_saas/img/p2.png">
+                            <div class="card-body px-3">
+                                <div class="form-check">
+                                    <input class="form-check-input" type="radio" name="excelExportTypeRadio" id="excelExportType_AllInOneBook" value="option1" checked>
+                                    <label class="form-check-label" for="excelExportType_AllInOneBook">
+                                        多个表导出一个Excel文件
+                                    </label>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-6">
+                        <div class="card">
+                            <img class="card-img-top" src="/web/building_saas/img/p1.png">
+                            <div class="card-body px-3">
+                                <div class="form-check">
+                                    <input class="form-check-input" type="radio" name="excelExportTypeRadio" id="excelExportType_IndividualBook" value="option2" checked>
+                                    <label class="form-check-label" for="excelExportType_IndividualBook">
+                                        每个表导出一个Excel文件
+                                    </label>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <a onclick="rptControlObj.getExcel()" class="btn btn-primary" data-dismiss="modal">确定导出</a>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+            </div>
+        </div>
+    </div>
+</div>

app/view/report/rpt_content_format.html

@@ -1,4 +1,4 @@
-<div class="modal fade" id="content_format" data-backdrop="static">
+<div class="modal fade" id="format" data-backdrop="static">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">

app/view/report/rpt_export.html

@@ -1,38 +0,0 @@
-<div class="modal fade" id="export" data-backdrop="static">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title">选择导出格式</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div class="row">
-                    <div class="col-6">
-                        <a class="btn btn-block btn-outline-secondary" id="PDF_TYPE" onclick="rptControlObj.changeType('PDF')">
-                            <!-- <i class="fa fa-check-square pull-right"></i> -->
-                            <div class="card-body text-center">
-                                <h1 class="display-3"><i class="fa fa-file-pdf-o"></i></h1>
-                                <h1>PDF</h1>
-                            </div>
-                        </a>
-                    </div>
-                    <div class="col-6">
-                        <a class="btn btn-block btn-primary" id="EXCEL_TYPE" onclick="rptControlObj.changeType('Excel')">
-                            <!-- <i class="fa fa-check-square pull-right"></i> -->
-                            <div class="card-body text-center">
-                                <h1 class="display-3"><i class="fa fa-file-excel-o"></i></h1>
-                                <h1>Excel</h1>
-                            </div>
-                        </a>
-                    </div>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                <a onclick="rptControlObj.outputRpt();" class="btn btn-primary">确定</a>
-            </div>
-        </div>
-    </div>
-</div>

app/view/report/rpt_export_excel.html

@@ -1,46 +0,0 @@
-<div class="modal fade" id="export_excel" data-backdrop="static">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title">批量导出Excel</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div class="row">
-                    <div class="col-6">
-                        <div class="card">
-                            <img class="card-img-top" src="/web/building_saas/img/p2.png">
-                            <div class="card-body px-3">
-                                <div class="form-check">
-                                    <input class="form-check-input" type="radio" name="excelExportTypeRadio" id="excelExportType_AllInOneBook" value="option1" checked>
-                                    <label class="form-check-label" for="excelExportType_AllInOneBook">
-                                        多个表导出一个Excel文件
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-6">
-                        <div class="card">
-                            <img class="card-img-top" src="/web/building_saas/img/p1.png">
-                            <div class="card-body px-3">
-                                <div class="form-check">
-                                    <input class="form-check-input" type="radio" name="excelExportTypeRadio" id="excelExportType_IndividualBook" value="option2" checked>
-                                    <label class="form-check-label" for="excelExportType_IndividualBook">
-                                        每个表导出一个Excel文件
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <a onclick="rptControlObj.getExcel()" class="btn btn-primary" data-dismiss="modal">确定导出</a>
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-            </div>
-        </div>
-    </div>
-</div>

app/view/report/rpt_margins.ejs

@@ -1,60 +0,0 @@
-<div class="modal fade" id="paper" data-backdrop="static">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title">页边距（毫米）</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div class="row mb-1 justify-content-center">
-                    <div class="col-3">
-                        <div class="input-group input-group-sm ">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text" id="basic-addon1">上</span>
-                            </div>
-                            <input type="number" class="form-control" value="12">
-                        </div>
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <div class="col-3">
-                        <div class="input-group input-group-sm ">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text" id="basic-addon2">左</span>
-                            </div>
-                            <input type="number" class="form-control" value="12">
-                        </div>
-                    </div>
-                    <div class="col-6">
-                        <h1 class="display-4 text-center"><i class="fa fa-file-o"></i></h1>
-                    </div>
-                    <div class="col-3">
-                        <div class="input-group input-group-sm ">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text" id="basic-addon3">右</span>
-                            </div>
-                            <input type="number" class="form-control" value="12">
-                        </div>
-                    </div>
-                </div>
-                <div class="row mb-1 justify-content-center">
-                    <div class="col-3">
-                        <div class="input-group input-group-sm ">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text" id="basic-addon4">下</span>
-                            </div>
-                            <input type="number" class="form-control" value="12">
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-link float-left" data-dismiss="modal">恢复默认值</button>
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                <a href="" class="btn btn-primary">确定</a>
-            </div>
-        </div>
-    </div>
-</div>

app/view/report/rpt_select_projects.html

@@ -1,37 +0,0 @@
-<div class="modal fade" id="cpoj" data-backdrop="static">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title">选择项目</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div class="modal-auto-height">
-                    <ul id="prjFolderTree" class="ztree"></ul>
-                </div>
-            </div>
-            <div class="modal-footer" id="divReqBillSummary" style="display:none">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                <a onclick="zTreeOprObj.requestBillsSummaryRpt()" class="btn btn-primary" data-dismiss="modal">确定</a>
-            </div>
-            <div class="modal-footer" id="divReqGljSummary" style="display:none">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                <a onclick="zTreeOprObj.requestGljSummaryRpt()" class="btn btn-primary" data-dismiss="modal" >确定</a>
-            </div>
-            <div class="modal-footer" id="divReqCommonSummaryExcel" style="display:none">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                <a onclick="zTreeOprObj.requestSumAndNormalRptForAllInOneExcel()" class="btn btn-primary" data-dismiss="modal">确定</a>
-            </div>
-            <div class="modal-footer" id="divReqCommonSummaryMultiExcel" style="display:none">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                <a onclick="zTreeOprObj.requestSumAndNormalRptForMultiExcel()" class="btn btn-primary" data-dismiss="modal">确定</a>
-            </div>
-            <div class="modal-footer" id="divReqCommonSummaryPDF" style="display:none">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                <a onclick="zTreeOprObj.requestSumAndNormalRptForPDF()" class="btn btn-primary" data-dismiss="modal">确定</a>
-            </div>
-        </div>
-    </div>
-</div>