报表相关问题

app/controller/report_controller.js

@@ -7,7 +7,6 @@
 const tenderMenu = require('../../config/menu').tenderMenu;
 const measureType = require('../const/tender').measureType;
 const auditConst = require('../const/audit');
-// const auditConst = require('../const/audit').stage;
 const accountGroup = require('../const/account_group').group;
 const JpcEx = require('../reports/rpt_component/jpc_ex');
 const JV = require('../reports/rpt_component/jpc_value_define');
@@ -159,6 +158,7 @@ module.exports = app => {
                     categoryData,
                     tenderList,
                     auditConst: auditConst.stage,
+                    ledgerAuditConst: auditConst.ledger,
                     jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.report.main),
                     customSelects,
                     rptCustomType: reportConst.rptCustomType,

app/public/js/shares/tenders2tree.js

@@ -72,7 +72,7 @@ const Tender2Tree = (function () {
         return tenderCategory;
     }
 
-    function convert (category, tenders) {
+    function convert (category, tenders, ledgerAuditConst, stageAuditConst) {
         tenderTree.clearDatas();
 
         const levelCategory = category.filter(function (c) {
@@ -85,7 +85,7 @@ const Tender2Tree = (function () {
                 tid: t.id,
                 name: t.name,
                 phase: t.lastStage ? '第' + t.lastStage.order + '期' : '台账',
-                status: t.lastStage ? auditConst.stage.statusString[t.lastStage.status] : auditConst.ledger.statusString[t.ledger_status]
+                status: t.lastStage ? stageAuditConst.statusString[t.lastStage.status] : ledgerAuditConst.statusString[t.ledger_status]
             }, parent);
         }
         tenderTree.sortTreeNode(false);

app/public/report/js/rpt_custom.js

@@ -435,7 +435,7 @@ const rptCustomObj = (function () {
             selectedBackColor: '#fffacd',
         };
         SpreadJsObj.initSheet(gsObj.gsSheet, spreadSetting);
-        gsObj.tenderSourceTree = Tender2Tree.convert(category, tenders);
+        gsObj.tenderSourceTree = Tender2Tree.convert(category, tenders, ledgerAuditConst, auditConst);
         SpreadJsObj.loadSheetData(gsObj.gsSheet, SpreadJsObj.DataType.Tree, gsObj.tenderSourceTree);
         gsSpread.bind(spreadNS.Events.ButtonClicked, gatherSelectSpreadObj.gsButtonClicked);
 

app/view/report/index.ejs

@@ -1,12 +1,16 @@
+<% if (stg_id === -1) {%>
 <% include ../tender/tender_sub_menu.ejs %>
+<% } else { %>
+<% include ../stage/stage_sub_menu.ejs %>
+<% } %>
 <div class="panel-content">
     <div class="panel-title">
         <div class="title-main d-flex">
             <% if(stg_id === -1) { %>
                 <% include ../tender/tender_sub_mini_menu.ejs %>
             <% } else { %>
-                <% include ../stage/stage_sub_mini_menu.ejs %> <%
-            } %>
+                <% include ../stage/stage_sub_mini_menu.ejs %>
+            <% } %>
             <div>
                 <div class="d-inline-block">
                     <div class="dropdown">
@@ -215,6 +219,7 @@
     const tenders = JSON.parse('<%- JSON.stringify(tenderList) %>');
     const category = JSON.parse('<%- JSON.stringify(categoryData) %>');
     const auditConst = JSON.parse('<%- JSON.stringify(auditConst) %>');
+    const ledgerAuditConst = JSON.parse('<%- JSON.stringify(ledgerAuditConst) %>');
     $(document).ready(() => {
         rptCustomObj.initTenderTree(tenders, category);
     });

app/view/stage/stage_sub_menu.ejs

@@ -27,7 +27,7 @@
         <div class="nav-box">
             <ul class="nav-list list-unstyled">
                 <li class="<% if (ctx.url === '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order + '/pay') { %>active<% } %>">
-                    <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- stage.order %>/pay"><span class="ml-3">合同支付</span></a>
+                    <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/pay"><span class="ml-3">合同支付</span></a>
                 </li>
             </ul>
         </div>
@@ -35,7 +35,7 @@
         <div class="nav-box">
             <ul class="nav-list list-unstyled">
                 <li class="<% if (ctx.url === '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order + '/bwtz') { %>active<% } %>">
-                    <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- stage.order %>/bwtz"><span class="ml-3">部位台帐</span></a>
+                    <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/bwtz"><span class="ml-3">部位台帐</span></a>
                 </li>
             </ul>
         </div>
@@ -43,21 +43,21 @@
         <div class="nav-box">
             <ul class="nav-list list-unstyled">
                 <li class="<% if (ctx.url === '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order + '/change') { %>active<% } %>">
-                    <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- stage.order %>/change"><span class="ml-3">变更概况</span></a>
+                    <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/change"><span class="ml-3">变更概况</span></a>
                 </li>
             </ul>
         </div>
         <div class="nav-box">
             <ul class="nav-list list-unstyled">
                 <li class="<% if (ctx.url === '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order + '/gather') { %>active<% } %>">
-                    <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- stage.order %>/gather"><span class="ml-3">清单汇总</span></a>
+                    <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/gather"><span class="ml-3">清单汇总</span></a>
                 </li>
             </ul>
         </div>
         <div class="nav-box">
             <ul class="nav-list list-unstyled">
                 <li class="<% if (ctx.url === '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order + '/compare') { %>active<% } %>">
-                    <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- stage.order %>/compare"><span class="ml-3">审核比较</span></a>
+                    <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/compare"><span class="ml-3">审核比较</span></a>
                 </li>
             </ul>
         </div>