فهرست منبع

fix: TASK #5329 调整,隐藏未实现功能的界面

Tony Kang 2 روز پیش
والد
کامیت
7693abcdd3
1فایلهای تغییر یافته به همراه13 افزوده شده و 13 حذف شده
  1. 13 13
      app/view/report/rpt_format_setup.ejs

+ 13 - 13
app/view/report/rpt_format_setup.ejs

@@ -22,7 +22,7 @@
         <div class="c-body">
             <div class="sjs-height-0 row">
                 <div class="col-auto pr-0" id="format-tree-view" style="width: 20%">
-                    <div class="d-inline-block">
+                    <!-- <div class="d-inline-block">
                         <div class="dropdown">
                         <button class="btn btn-sm btn-light dropdown-toggle text-primary" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> 显示层级</button>
                         <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
@@ -49,7 +49,7 @@
                             </div>
                         </div>
                         </div>
-                    </div>                    
+                    </div> -->
                     <div class="sjs-height-1" style="overflow: auto">
                         <div class="text-center"></div>
                         <ul id="rptFormatSetupTplTree" class="ztree"></ul>
@@ -58,7 +58,7 @@
                 <div class="col-auto" id="format-main-view" style="width: 80%">
                     <nav class="nav nav-tabs m-3" role="tablist">
                         <a class="nav-item nav-link active" data-toggle="tab" data-target="#format-setup-edit" href="#format-setup-edit" role="tab" aria-selected="true">修改报表模板</a>
-                        <a class="nav-item nav-link" data-toggle="tab" data-target="#format-setup-private" href="#format-setup-private" role="tab" aria-selected="false">报表私有化</a>
+                        <!-- <a class="nav-item nav-link" data-toggle="tab" data-target="#format-setup-private" href="#format-setup-private" role="tab" aria-selected="false">报表私有化</a> -->
                     </nav>
                     <div class="tab-content m-3">
                         <div id="format-setup-edit" class="tab-pane active">
@@ -249,8 +249,8 @@
     // 初始化报表模板数
     buildTplTree();
 
-    // 初始化报表树
-    filterReportsByType(ALL_COMMON_TREE_NODES, ALL_INDIVI_TREE_NODES, CURRENT_SELECTED_BIZ_TYPE, TOP_TREE_NODES, CUST_TREE_NODES);
+    // 初始化报表树 备注:这里不用考虑过滤了,把全部的定制报表显示即可
+    // filterReportsByType(ALL_COMMON_TREE_NODES, ALL_INDIVI_TREE_NODES, CURRENT_SELECTED_BIZ_TYPE, TOP_TREE_NODES, CUST_TREE_NODES);
     getReportTemplateTree();
     refreshNodes();
 
@@ -269,14 +269,14 @@
             if (TOP_TREE_NODES.length > 0) {
                 // 1.1 移除未被选择的模板
                 filterUnchkTplTreeNode(TOP_TREE_NODES[0], CUST_TREE_NODES.common);
-                TOP_TREE_NODES.unshift(individualNode); //定制在前
-                if (CUST_TREE_NODES.customize && CUST_TREE_NODES.customize.length > 0) {
-                    // 优先过滤用户选择
-                    filterUnchkTplTreeNode(TOP_TREE_NODES[0], CUST_TREE_NODES.customize);
-                } else if (PAGE_SHOW['closeShowAllCustomized'] === 1) {
-                    // 如果没有用户选择 且 关闭显示所有定制表
-                    filterUnchkTplTreeNode(TOP_TREE_NODES[0], []);
-                }
+                TOP_TREE_NODES.unshift(individualNode); //定制在前,且不用过滤
+                // if (CUST_TREE_NODES.customize && CUST_TREE_NODES.customize.length > 0) {
+                //     // 优先过滤用户选择
+                //     filterUnchkTplTreeNode(TOP_TREE_NODES[0], CUST_TREE_NODES.customize);
+                // } else if (PAGE_SHOW['closeShowAllCustomized'] === 1) {
+                //     // 如果没有用户选择 且 关闭显示所有定制表
+                //     filterUnchkTplTreeNode(TOP_TREE_NODES[0], []);
+                // }
             }
             //2. 原始的模板树(恢复用)
             const individualNodeOrg = {id: 99999, name: '定制报表', pid: -1, rpt_type: 0, items: [], isParent: true};