TASK #5248 调整

app/controller/report_controller.js

@@ -932,7 +932,7 @@ module.exports = app => {
                 const stage_status = -1;
                 const project_id = ctx.params.id;
                 const { treeNodes, custCfg, commonArrs } = await this._createNodes(ctx, sourceTypeConst.sourceType.contract_management, project_id);
-                if (stage_id === -400) {
+                if (stage_id === -600) {
                     // 统一为合同管理
                 }
                 const cust_select_keys = JSON.stringify(['common', 'customize']); // 因其他地方也有可能保存用户报表的显示选择项，因当初设计问题，不好改数据库结构了，但可以调节内部json来满足需求
@@ -1048,13 +1048,13 @@ module.exports = app => {
 
         async indexForProjectContract(ctx) {
             const preUrl = `/sp/${ctx.params.prjid}/contract/panel`;
-            await this._indexForContract(ctx, sourceTypeConst.sourceType.contract_management, -400, preUrl);
+            await this._indexForContract(ctx, sourceTypeConst.sourceType.contract_management, -600, preUrl);
         }
 
         async indexForTenderContract(ctx) {
             // const preUrl = `/sp/${ctx.params.prjid}/contract/panel`;
             const preUrl = '';
-            await this._indexForContract(ctx, sourceTypeConst.sourceType.contract_management, -400, preUrl);
+            await this._indexForContract(ctx, sourceTypeConst.sourceType.contract_management, -600, preUrl);
         }
 
         /**
@@ -1429,7 +1429,7 @@ module.exports = app => {
                 stageFlow = [];
                 await this._commonGetAudit(ctx, params, stgAudit, stageFlow);
                 this._mergeBlankRoleSignDate(roleRel, stgAudit);
-            } else if ([-400, -500].includes(params.stage_id)) {
+            } else if ([-400, -500, -600].includes(params.stage_id)) {
                 stgAudit = [];
             }
 

app/public/report/js/rpt_main.js

@@ -503,7 +503,7 @@ let zTreeOprObj = {
         } else {
             params.needWaterMark = false;
         }
-        const url = (STAGE_ID === -400) ? '/contract/report_api/getReport' : '/tender/report_api/getReport';
+        const url = (STAGE_ID === -600) ? '/contract/report_api/getReport' : '/tender/report_api/getReport';
         $.bootstrapLoading.start();
         CommonAjax.postXsrfEx(url, params, 300000, true, getCookie('csrfToken_j'),
             async function(result){

app/service/report.js

@@ -719,7 +719,7 @@ module.exports = app => {
         }
 
         // params = { }
-        async contract(params, sourceFilters, memFieldKeys, customDefine, customSelect) {
+        async contract_management(params, sourceFilters, memFieldKeys, customDefine, customSelect) {
             const RptAdvance = require('../lib/rm/contract');
             const rptAdvance = new RptAdvance(this.ctx);
 

app/view/report/index.ejs

@@ -6,7 +6,7 @@
     <% include ../budget/sub_menu.ejs %>
 <% } else if ([-300, -301, -302, -303].includes(stg_id)) { %>
     <% include ../tender/tender_sub_menu.ejs %>
-<% } else if ([-400, -401].includes(stg_id)) { %>
+<% } else if ([-600].includes(stg_id)) { %>
     <% include ../contract/sub_menu.ejs %>
 <% } else { %>
     <% include ../stage/stage_sub_menu.ejs %>
@@ -16,7 +16,7 @@
         <div class="title-main d-flex">
             <% if(stg_id === -1) { %>
                 <% include ../tender/tender_sub_mini_menu.ejs %>
-            <% } else if ([-100, -200, -300, -301, -302, -303, -400, -401].includes(stg_id)) { %>
+            <% } else if ([-100, -200, -300, -301, -302, -303, -600].includes(stg_id)) { %>
             <% } else { %>
                 <% include ../stage/stage_sub_mini_menu.ejs %>
             <% } %>
@@ -48,7 +48,7 @@
                     </div>
                 </div>
                 <% } %>
-                <% if (false || ![-100, -200, -300, -301, -302, -303, -400].includes(stg_id)) { %>
+                <% if (false || ![-100, -200, -300, -301, -302, -303, -600].includes(stg_id)) { %>
                 <div class="d-inline-block" id="divSelectableBizs_up">
                     <div class="dropdown" id="divSelectableStages">
                         <button class="btn btn-sm btn-light dropdown-toggle text-primary" type="button" id="btnCurrentStage" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
@@ -64,7 +64,7 @@
                     </div>
                 </div>
                 <% } %>
-                <% if (stg_id === -200 || ![-100, -300, -301, -302, -303, -400, -401].includes(stg_id)) { %>
+                <% if (stg_id === -200 || ![-100, -300, -301, -302, -303, -600].includes(stg_id)) { %>
                 <div class="d-inline-block" id="report_selects_div">
                     <ul class="nav nav-pills m-0" id="report_selects_ul">
                         <% if (ctx.session.sessionUser.is_admin || ctx.session.sessionProject.page_show.isCommonSetup) { %>
@@ -618,7 +618,7 @@
         CUST_CFG.continuousOutput = false;
     }
     //
-    <% if (stg_id === -400) {%>
+    <% if (stg_id === -600) {%>
         const PROJECT_ID = '<%- project_id %>';
     <% } else { %>
         const PROJECT_ID = <%- project_id %>;
@@ -677,7 +677,7 @@
         current_stage_status = STAGE_LIST[STAGE_LIST.length - 1].status;
     }
 
-    <% if (false || ![-100, -200, -300, -301, -302, -303, -400, -401].includes(stg_id)) { %>
+    <% if (false || ![-100, -200, -300, -301, -302, -303, -600].includes(stg_id)) { %>
     buildStageSelection();
     <% } %>
     setupSignature();

app/view/report/rpt_all_popup.ejs

@@ -813,7 +813,7 @@
         </div>
     </div>
 </div>
-<% if (![-100, -200, -300, -301, -302, -303, -400, -401].includes(stg_id)) { %>
+<% if (![-100, -200, -300, -301, -302, -303, -600].includes(stg_id)) { %>
 <% include ../stage/audit_modal.ejs %>
 <% } %>
 
@@ -821,7 +821,7 @@
     zTreeOprObj.getCustomerCfg();
     zTreeOprObj.iniFontCfgDom(CUST_CFG);
     
-    <% if (![-100, -300, -301, -302, -303, -400, -401].includes(stg_id)) { %>
+    <% if (![-100, -300, -301, -302, -303, -600].includes(stg_id)) { %>
     buildCustRptCommon('report_cust_group_common', ORG_TOP_TREE_NODES[1], CUST_TREE_NODES.common, 'true');
     buildCustRptCommon('report_cust_group_individual', ORG_TOP_TREE_NODES[0], CUST_TREE_NODES.customize, 'false');
     <% } %>