Browse Source

部分修改提交

laiguoran 3 years ago
parent
commit
2c642b31e3
2 changed files with 5 additions and 4 deletions
  1. 2 2
      app/controller/report_controller.js
  2. 3 2
      app/public/report/js/rpt_archive.js

+ 2 - 2
app/controller/report_controller.js

@@ -72,8 +72,8 @@ module.exports = app => {
         async index(ctx) {
             try {
                 await this._getStageAuditViewData(ctx);
-                let pageShow = ctx.session.sessionProject.page_show;
-                pageShow.showArchive = 0;
+                const pageShow = ctx.session.sessionProject.page_show;
+                pageShow.showArchive = 1;
                 const tender = ctx.tender;
                 const stage = ctx.stage;
                 let stage_id = -1;

+ 3 - 2
app/public/report/js/rpt_archive.js

@@ -578,8 +578,9 @@ function download(url, filename) {
 
 $(function () {
     $('#download_file').click(function () {
-        if (rptArchiveObj.currentArchiveUuid) {
-            download(`${oss_path}/${rptArchiveObj.currentArchiveUuid}.PDF`, `${rptArchiveObj.currentNode.name} ${rptArchiveObj.currentArchiveDateStr}.pdf`);
+        if (rptArchiveObj.currentArchiveUuid && rptArchiveObj.currentArchivePdfPath) {
+            console.log(rptArchiveObj.currentArchivePdfPath);
+            download(`${rptArchiveObj.currentArchivePdfPath}`, `${rptArchiveObj.currentNode.name} ${rptArchiveObj.currentArchiveDateStr}.pdf`);
         } else {
             alert('请选择打开一个报表!');
         }