Просмотр исходного кода

审批人选择,导出excel时,需rpt的id

MaiXinRong 5 лет назад
Родитель
Сommit
ac709d36ba
2 измененных файлов с 4 добавлено и 2 удалено
  1. 3 1
      app/controller/report_controller.js
  2. 1 1
      app/lib/rpt_data_analysis.js

+ 3 - 1
app/controller/report_controller.js

@@ -596,7 +596,9 @@ async function getMultiRptsCommon(ctx, params, outputType, baseDir) {
         return params.rpt_ids.indexOf(rpt1.id) - params.rpt_ids.indexOf(rpt2.id);
     });
     for (let rtIdx = 0; rtIdx < rptTpls.length; rtIdx++) {
+        const id = rptTpls[rtIdx].id;
         rptTpls[rtIdx] = JSON.parse(rptTpls[rtIdx].rpt_content);
+        rptTpls[rtIdx].id = id;
     }
     const rptDataUtil = new rptDataExtractor();
     const filterTables = [];
@@ -648,7 +650,7 @@ async function getMultiRptsCommon(ctx, params, outputType, baseDir) {
         for (let tplIdx = 0; tplIdx < rptTpls.length; tplIdx++) {
             const rptTpl = (rptTpls[tplIdx]._doc) ? rptTpls[tplIdx]._doc : rptTpls[tplIdx];
             rptDataUtil.initialize(rptTpl);
-            const customSelect = await ctx.service.rptCustomDefine.getCustomDefine(params.tender_id, params.stage_id, rptTpls[tplIdx].id);
+            const customSelect = await ctx.service.rptCustomDefine.getCustomDefine(params.tender_id, params.stage_id, rptTpl.id);
             const tplData = rptDataUtil.assembleData(ctx, rawDataObj, baseDir, null, customSelect);
             const printCom = JpcEx.createNew();
             rptTpl[JV.NODE_MAIN_INFO][JV.NODE_PAGE_INFO][JV.PROP_PAGE_SIZE] = params.pageSize;

+ 1 - 1
app/lib/rpt_data_analysis.js

@@ -942,7 +942,7 @@ const auditSelect = {
             }
         } else {
             const setting = JSON.stringify(asDefine.setting);
-            for (const [i, s] of setting.select.entries) {
+            for (const [i, s] of setting.select.entries()) {
                 order.push(i);
             }
         }