Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/controller/report_controller.js

@@ -7,6 +7,7 @@
 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');
@@ -68,7 +69,7 @@ module.exports = app => {
                     customSelects.audit_select = await ctx.service.rptCustomDefine.getCustomSelectByRpt(cid,
                         reportConst.rptCustomType[JV.NODE_CUS_AUDIT_SELECT], ctx.tender.id, ctx.stage.id);
                     customSelects.stageFlow = await ctx.service.stageAudit.getAuditGroupByListWithOwner(
-                        params.stage_id, params.stage_times);
+                        ctx.stage.stage_id, ctx.stage.stage_times);
                 } else {
                     customSelects.audit_select = [];
                 }
@@ -151,7 +152,7 @@ module.exports = app => {
                     measureType,
                     categoryData,
                     tenderList,
-                    auditConst,
+                    auditConst: auditConst.stage,
                     jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.report.main),
                     customSelects,
                     rptCustomType: reportConst.rptCustomType,

app/public/js/stage_audit.js

@@ -156,7 +156,7 @@ $(document).ready(function () {
 // 检查上报情况
 function checkAuditorFrom () {
     if ($('#auditors li').length === 0) {
-        toast.error('请先选择审批人，再上报数据');
+        toastr.error('请先选择审批人，再上报数据');
         return false;
     }
     $('#hide-all').show();

app/public/report/js/rpt_main.js

@@ -104,6 +104,16 @@ let zTreeOprObj = {
         let nodeLv = 0;
         private_remove_hide_item(TOP_TREE_NODES, nodeLv);
         zTreeHelper.createTreeDirectly(TOP_TREE_NODES, rpt_tpl_setting, "rptTplTree", me);
+        me.treeObj.expandAll(false);
+        let topNodes = me.treeObj.getNodes();
+        for (let topLvItem of topNodes) {
+            me.treeObj.expandNode(topLvItem, true, false, false);
+            if (topLvItem.items && topLvItem.items.length > 0) {
+                for (let secTopLvItem of topLvItem.items) {
+                    me.treeObj.expandNode(secTopLvItem, true, false, false);
+                }
+            }
+        }
         me.refreshNodes();
     },
     getCustomerCfg: function() {
@@ -211,6 +221,9 @@ let zTreeOprObj = {
     onCheck: function(event, treeId, treeNode) {
         zTreeOprObj.countChkedRptTpl();
         rptCustomObj.showMaterialSelect();
+        if (treeNode.isParent) {
+            zTreeOprObj.treeObj.expandNode(treeNode, true, true, false);
+        }
     },
     onClick: function(event,treeId,treeNode) {
         let me = zTreeOprObj;

app/view/report/index.ejs

@@ -2,7 +2,11 @@
 <div class="panel-content">
     <div class="panel-title">
         <div class="title-main d-flex">
-            <% include ../tender/tender_sub_mini_menu.ejs %>
+            <% if(stg_id === -1) { %>
+                <% include ../tender/tender_sub_mini_menu.ejs %>
+            <% } else { %>
+                <% include ../stage/stage_sub_mini_menu.ejs %> <%
+            } %>
             <div>
                 <div class="d-inline-block">
                     <div class="dropdown">
@@ -344,7 +348,8 @@
                     TOP_TREE_NODES.splice(tnIdx, 1);
                 }
             }
-            TOP_TREE_NODES.push(individualNode);
+            //TOP_TREE_NODES.push(individualNode);
+            TOP_TREE_NODES.unshift(individualNode);
             //2. 原始的模板树(恢复用)
             const individualNodeOrg = {id: 99999, name: '定制报表', pid: -1, rpt_type: 0, items: [], isParent: true};
             for (let tnIdx = ORG_TOP_TREE_NODES.length - 1; tnIdx >= 0; tnIdx--) {
@@ -355,7 +360,8 @@
                     ORG_TOP_TREE_NODES.splice(tnIdx, 1);
                 }
             }
-            ORG_TOP_TREE_NODES.push(individualNode);
+            //ORG_TOP_TREE_NODES.push(individualNode);
+            ORG_TOP_TREE_NODES.unshift(individualNode);
         }
     }
 
@@ -366,7 +372,7 @@
             $("#optionSelectableStages")[0].style.display = '';
             $("#btnCurrentStage")[0].innerText = '第' + current_stage_order + '期';
             $("#optionSelectableStages").empty();
-            if (STAGE_LIST.length > 0) {
+            if (STAGE_LIST.length > 0 && STAGE_ID < 0) {
                 for (let i = STAGE_LIST.length; i > 0; i--) {
                     if (parseInt(STAGE_LIST[i - 1].order) !== current_stage_order) {
                         const str = '<a class="dropdown-item" style="cursor:pointer" onclick="changeCurrentStage(this)" stg_id = "' + STAGE_LIST[i - 1].id + '" stg_order="' + STAGE_LIST[i - 1].order + '">第' + STAGE_LIST[i - 1].order + '期</a>';

app/view/stage/stage_sub_mini_menu.ejs

@@ -27,35 +27,42 @@
         <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>
         <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>
         <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>
+        <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/<%- ctx.stage.order %>/report"><span class="ml-3">报表</span></a>
                 </li>
             </ul>
         </div>