TonyKang 4 năm trước cách đây
mục cha
commit
321b35afc6

+ 1 - 0
.gitignore

@@ -11,6 +11,7 @@ app/public/upload/
 *.swp
 package-lock.json
 app/public/js/web
+app/public/archive
 .vscode/
 /report_temp
 /file

+ 2 - 2
app/controller/report_archive_controller.js

@@ -14,7 +14,7 @@ const fsUtil = require('../public/js/fsUtil');
 const auditConst = require('../const/audit');
 
 module.exports = app => {
-    class ReportController extends app.BaseController {
+    class ReportArchiveController extends app.BaseController {
 
         async index(ctx) {
             const tender = ctx.tender;
@@ -270,6 +270,6 @@ module.exports = app => {
         }
 
     }
-    return ReportController;
+    return ReportArchiveController;
 };
 

+ 9 - 0
app/public/report/js/rpt_archive.js

@@ -179,6 +179,7 @@ let rptArchiveObj = {
         //初始化当前报表已经归档的信息
         //ARCHIVE_LIST结构:[{rpt_id, items: [{uuid, update_time, is_common}...最多3个]}...] (当前项目、当前期的所有报表归档信息)
         if (currentNode) {
+            //1. cardArchiveInfo
             let cardArchiveInfo = $('#cardArchiveInfo');
             cardArchiveInfo.empty();
             let auditDate = null;
@@ -217,6 +218,14 @@ let rptArchiveObj = {
                 }
             }
             cardArchiveInfo.append('</div>');
+            //2. selectionArchiveInfo
+            let selectionArchiveInfo = $('#selectionArchiveInfo');
+            selectionArchiveInfo.empty();
+            if (achivedAmt > 0) {
+                for (let idx = 0; idx < achivedItem.items.length; idx++) {
+                    selectionArchiveInfo.append('<a class="dropdown-item" href="javascript: void(0);">#' + (idx + 1) + ' ' + achivedItem.items[idx].updateDate_time + '</a>');
+                }
+            }
         }
     },
     _getCurrentArchives: function (currentNode) {

+ 18 - 9
app/view/report/index.ejs

@@ -73,11 +73,7 @@
                                             <button id="btnArchiveList" type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" disabled>
                                                 已归档
                                             </button>
-                                            <div class="dropdown-menu" aria-labelledby="btnGroupDrop1" style="min-width:112px">
-                                                <!--
-                                                <a class="dropdown-item" href="#">#1 2021-03-01</a>
-                                                <a class="dropdown-item" href="#">#2 2021-02-28</a>
-                                                -->
+                                            <div class="dropdown-menu" aria-labelledby="btnGroupDrop1" style="min-width:112px" id="selectionArchiveInfo">
                                             </div>
                                         </div>
                                     </div>
@@ -536,10 +532,23 @@
                 break;
             }
         }
-        buildStageSelection();
-        setupSignature();
-        //还有必要触发报表刷新!
-        zTreeOprObj.onClick(null, null, zTreeOprObj.currentNode);
+        let params = {prjId: PROJECT_ID, stgId: current_stage_id};
+        $.bootstrapLoading.start();
+        CommonAjax.postXsrfEx("/tender/report_api/getReportArchive", params, 10000, true, getCookie('csrfToken_j'),
+            function(result){
+                $.bootstrapLoading.end();
+                ARCHIVE_LIST = result.data;
+                buildStageSelection();
+                setupSignature();
+                //还有必要触发报表刷新!
+                zTreeOprObj.onClick(null, null, zTreeOprObj.currentNode);
+                //console.log(ARCHIVE_LIST);
+            }, function(err){
+                $.bootstrapLoading.end();
+            }, function(ex){
+                $.bootstrapLoading.end();
+            }
+        );
     }
 
     function setupSignature() {