Sfoglia il codice sorgente

报表,多期汇总表,批量导出问题

MaiXinRong 4 anni fa
parent
commit
695a04175b
1 ha cambiato i file con 6 aggiunte e 6 eliminazioni
  1. 6 6
      app/public/report/js/rpt_custom.js

+ 6 - 6
app/public/report/js/rpt_custom.js

@@ -537,23 +537,23 @@ const rptCustomObj = (function () {
                 return x.id === rptId;
                 return x.id === rptId;
             });
             });
             if (gather_select && gather_select.custom_define && gather_select.custom_define[sGatherSelect].enable) {
             if (gather_select && gather_select.custom_define && gather_select.custom_define[sGatherSelect].enable) {
-                const data = {};
                 if (rptId === currentRptId) {
                 if (rptId === currentRptId) {
+                    const data = {};
                     data[sGatherSelect] = gather_select[sGatherSelect];
                     data[sGatherSelect] = gather_select[sGatherSelect];
+                    params.customSelect.push(data);
                 } else {
                 } else {
                     const chkNode = chkNodes.find(function (x) { return x.refId === rptId});
                     const chkNode = chkNodes.find(function (x) { return x.refId === rptId});
-                    data[sGatherSelect] = await comfirmSelectPromise(chkNode ? chkNode.name : '', gather_select);
+                    params.customSelect.push(await comfirmSelectPromise(chkNode ? chkNode.name : '', gather_select));
                 }
                 }
-                params.customSelect.push(data);
             } else if (stage_select && stage_select.custom_define && stage_select.custom_define[sStageSelect].enable) {
             } else if (stage_select && stage_select.custom_define && stage_select.custom_define[sStageSelect].enable) {
-                const data = {};
                 if (rptId === currentRptId) {
                 if (rptId === currentRptId) {
+                    const data = {};
                     data[sStageSelect] = stage_select[sStageSelect];
                     data[sStageSelect] = stage_select[sStageSelect];
+                    params.customSelect.push(data);
                 } else {
                 } else {
                     const chkNode = chkNodes.find(function (x) { return x.refId === rptId});
                     const chkNode = chkNodes.find(function (x) { return x.refId === rptId});
-                    data[sStageSelect] = await comfirmSelectPromise(chkNode ? chkNode.name : '', stage_select);
+                    params.customSelect.push(await comfirmSelectPromise(chkNode ? chkNode.name : '', stage_select));
                 }
                 }
-                params.customSelect.push(data);
             } else {
             } else {
                 params.customSelect.push(null);
                 params.customSelect.push(null);
             }
             }