归档页面隐藏期 改进

app/controller/report_archive_controller.js

@@ -48,7 +48,14 @@ module.exports = app => {
                 }
             } else {
                 // console.log('stageList[0].id: ' + stageList[0].id);
-                const archives = await ctx.service.rptArchive.getPrjStgArchive(tender.data.project_id, stageList[stageList.length - 1].id);
+                let archives = [];
+                for (let sidx = stageList.length - 1; sidx >= 0; sidx--) {
+                    if (stageList[sidx].status === 3) {
+                        archives = await ctx.service.rptArchive.getPrjStgArchive(tender.data.project_id, stageList[sidx].id);
+                        break;
+                    }
+                }
+                // const archives = await ctx.service.rptArchive.getPrjStgArchive(tender.data.project_id, stageList[stageList.length - 1].id);
                 const archiveEncryptions = await ctx.service.rptArchiveEncryption.getPrjStgArchiveEncryption(tender.data.project_id, stageList[stageList.length - 1].id);
                 // stage_id = stageList[0].id;
                 // stage_order = stageList[0].order;
@@ -422,7 +429,15 @@ module.exports = app => {
                 }
             } else {
                 // console.log('stageList[0].id: ' + stageList[0].id);
-                const archives = await ctx.service.rptArchive.getPrjStgArchive(tender.data.project_id, stageList[stageList.length - 1].id);
+                // const archives = await ctx.service.rptArchive.getPrjStgArchive(tender.data.project_id, stageList[stageList.length - 1].id);
+                let archives = [];
+                for (let sidx = stageList.length - 1; sidx >= 0; sidx--) {
+                    if (stageList[sidx].status === 3) {
+                        archives = await ctx.service.rptArchive.getPrjStgArchive(tender.data.project_id, stageList[sidx].id);
+                        break;
+                    }
+                }
+
                 const archiveEncryptions = await ctx.service.rptArchiveEncryption.getPrjStgArchiveEncryption(tender.data.project_id, stageList[stageList.length - 1].id);
                 // stage_id = stageList[0].id;
                 // stage_order = stageList[0].order;

app/public/report/js/rpt_archive.js

@@ -446,6 +446,9 @@ let rptArchiveObj = {
         }
         return psInfo;
     },
+    archiveCurrentReportBefore: function (currentRptPageRst) {
+        //
+    },
     archiveCurrentReport: function(currentRptPageRst, currentNode) {
         // 归档当前报表
         if (currentRptPageRst !== null) {