Tony Kang 2 سال پیش
والد
کامیت
26bc02e1b3
4فایلهای تغییر یافته به همراه34 افزوده شده و 32 حذف شده
  1. 12 32
      app/controller/report_controller.js
  2. 20 0
      app/public/report/js/rpt_main.js
  3. 1 0
      app/router.js
  4. 1 0
      app/view/report/index.ejs

+ 12 - 32
app/controller/report_controller.js

@@ -435,6 +435,7 @@ module.exports = app => {
             });
 
             // console.log('encodeSignatureDataUri!');
+            // fsUtil.writeObjToFile(pageRst, 'D:/GitHome/Temp/testBuiltPageResult2.js');
             return {
                 data: pageRst,
                 signatureRelInfo: roleRel,
@@ -459,38 +460,6 @@ module.exports = app => {
                 // console.log('in getReport');
                 const params = JSON.parse(ctx.request.body.params);
                 ctx.body = await this._getReport(ctx, params);
-                // // console.log(params);
-                // let rptTpl = await ctx.service.rptTpl.getTplById(params.rpt_tpl_id);
-                // if (!rptTpl || rptTpl.length !== 1) {
-                //     throw '获取模板失败';
-                // }
-                // rptTpl = JSON.parse(rptTpl[0].rpt_content);
-                // // console.log('get the template!');
-                // const pageRst = await getAllPagesCommon(ctx, rptTpl, params, JV.PAGING_OPTION_NORMAL, JV.OUTPUT_TYPE_NORMAL, this.app.baseDir);
-                // // console.log(pageRst);
-                // // const roleRel = (params.stage_status === 3) ? (await ctx.service.roleRptRel.getRoleRptRelByDetailIds(params.tender_id, params.rpt_tpl_id)) : [];
-                // const roleRel = await ctx.service.roleRptRel.getRoleRptRelByDetailIds(params.tender_id, params.rpt_tpl_id); // 新需求中,允许在非审核状态下设置签名
-                // const stgAudit = await ctx.service.stageAudit.getStageAudit(params.stage_id, params.stage_times);
-                // // console.log('after role stage!');
-                // // console.log(roleRel);
-                // await encodeSignatureDataUri(roleRel, this.app.baseDir);
-                // await encodeDummySignatureDataUri(pageRst, this.app.baseDir);
-                // const stageFlow = await ctx.service.stageAudit.getAuditGroupByListWithOwner(params.stage_id, params.stage_times);
-                // const customSelect = await ctx.service.rptCustomDefine.getDataByCondition({
-                //     tid: params.tender_id, sid: params.stage_id, rid: params.rpt_tpl_id
-                // });
-                //
-                // // console.log('encodeSignatureDataUri!');
-                // ctx.body = {
-                //     data: pageRst,
-                //     signatureRelInfo: roleRel,
-                //     stageAudit: stgAudit,
-                //     debugInfo: ctx.app.config.is_debug ? ctx.debugInfo : null,
-                //     customDefine: rptTpl[JV.NODE_CUSTOM_DEFINE],
-                //     stageFlow,
-                //     customSelect,
-                // };
-                // // ctx.body = { data: { msg: 'test the network' } };
                 ctx.status = 201;
             } catch (ex) {
                 console.log(ex);
@@ -498,6 +467,17 @@ module.exports = app => {
             }
         }
 
+        async getTestReport(ctx) {
+            try {
+                const file = 'D:/GitHome/Temp/导出PDF_格式样本1.js';
+                const tplObj = JSON.parse(fs.readFileSync(file, 'utf-8'));
+                ctx.body = { data: tplObj };
+                ctx.status = 201;
+            } catch (ex) {
+                this.setMessage(ex.toString(), this.messageType.ERROR);
+            }
+        }
+
         /**
          * 获取多批次报表数据
          *

+ 20 - 0
app/public/report/js/rpt_main.js

@@ -944,6 +944,26 @@ let rptControlObj = {
             }
         }
     },
+    getTestPDFPre: function() {
+        const params = {};
+        $.bootstrapLoading.start();
+        CommonAjax.postXsrfEx("/tender/report_api/getTestReport", params, WAIT_TIME_EXPORT, true, getCookie('csrfToken_j'),
+            async function(result){
+                const pageSize = 'A4';
+                const rpt_names = ['测试PDF格式'];
+                $.bootstrapLoading.end();
+                downloadPDFReport([result.data], pageSize, rpt_names, [], [], [], STAGE_AUDIT);
+            },
+            function(failRst){
+                $.bootstrapLoading.end();
+                console.log(failRst);
+            },
+            function(exceptionRst){
+                $.bootstrapLoading.end();
+                console.log(exceptionRst);
+            }
+        );
+    },
     getPDFEx: async function () {
         let me = rptControlObj;
         if (zTreeOprObj.checkedRptTplNodes && zTreeOprObj.checkedRptTplNodes.length > 0 && PAGE_SHOW['closeExportPdf'] !== 1) {

+ 1 - 0
app/router.js

@@ -399,6 +399,7 @@ module.exports = app => {
     app.post('/tender/report_api/getReport', sessionAuth, 'reportController.getReport');
     app.post('/tender/report_api/getDirectReport', sessionAuth, 'reportController.createExcelFilesFromDirectData');
     app.post('/tender/report_api/getMultiReports', sessionAuth, 'reportController.getMultiReportsEx');
+    app.post('/tender/report_api/getTestReport', sessionAuth, 'reportController.getTestReport');
 
     app.post('/tender/report_api/createExcelFiles', sessionAuth, 'reportController.createExcelFilesEx');
     app.post('/tender/report_api/createExcelFilesInOneBook', sessionAuth, 'reportController.createExcelFilesInOneBookEx');

+ 1 - 0
app/view/report/index.ejs

@@ -82,6 +82,7 @@
                                         <button type="button" class="btn btn-outline-primary btn-sm" onclick="rptControlObj.checkAndGetExcel()" <% if (pageShow !== null && parseInt(pageShow.closeExportExcel) === 1) { %> disabled <% } %> ><i class="fa fa-file-excel-o"></i> Excel <span class="badge badge-primary">0</span></button>
                                         <button type="button" class="btn btn-outline-primary btn-sm" id="show_excel_output_cfg" data-toggle="modal" data-target="#export_excel" style="display:none"></button>
                                         <button type="button" class="btn btn-outline-primary btn-sm" onclick="rptControlObj.getPDFPre()" <% if (pageShow !== null && parseInt(pageShow.closeExportPdf) === 1) { %> disabled <% } %> ><i class="fa fa-file-pdf-o"></i> PDF <span class="badge badge-primary">0</span></button>
+                                        <!-- <button type="button" class="btn btn-outline-primary btn-sm" onclick="rptControlObj.getTestPDFPre()"><i class="fa fa-file-pdf-o"></i> T_PDF <span class="badge badge-primary">0</span></button> -->
                                     </div>
                                 </div>
                                 <div class="panel-foot text-muted">