TonyKang 7 éve
szülő
commit
3a5f91592e

+ 1 - 0
modules/reports/models/tpl_tree_node.js

@@ -23,6 +23,7 @@ let TplNodeSchema = new Schema({
     ID: Number,         //template节点ID,只有在nodeType是模板节点有效
     refId: Number,      //引用报表模板id (引用 collection: rpt_templates)
     name: String,       //显示名称
+    released: Boolean,  //是否已发布
     items: []           //子节点
 });
 

+ 15 - 0
web/maintain/report/js/rpt_tpl_main.js

@@ -111,10 +111,17 @@ let zTreeOprObj = {
     buildSubRootNodeDoc: function(subNode) {
         let me = this, rst = null;
         if (subNode) {
+            let isReleased = false;
+            if (subNode.nodeType == RT.NodeType.TEMPLATE) {
+                if (subNode.hasOwnProperty("released")) {
+                    isReleased = subNode.released;
+                }
+            }
             rst = {
                 nodeType: subNode.nodeType,
                 refId: subNode.refId,
                 ID: subNode.ID,
+                released: isReleased,
                 items: me.private_build_items(subNode.items, null),
                 name: subNode.name
             };
@@ -128,11 +135,18 @@ let zTreeOprObj = {
             itemRst = [];
             for (let item of items) {
                 if (item !== excludeNode) {
+                    let isReleased = false;
+                    if (item.nodeType == RT.NodeType.TEMPLATE) {
+                        if (item.hasOwnProperty("released")) {
+                            isReleased = item.released;
+                        }
+                    }
                     let ir = {};
                     ir.nodeType = item.nodeType;
                     ir.refId = item.refId;
                     ir.name = item.name;
                     ir.ID = item.ID;
+                    ir.released = isReleased;
                     ir.items = me.private_build_items(item.items);
                     itemRst.push(ir);
                 }
@@ -253,6 +267,7 @@ let zTreeOprObj = {
                 rawNode.nodeType = RT.NodeType.TEMPLATE;
                 rawNode.name = "新增报表模板";
                 rawNode.ID = newNodeID;
+                rawNode.released = false;
                 let newNodes = [], isSilent = false;
                 newNodes.push(rawNode);
                 me.treeObj.addNodes(me.currentNode, -1, newNodes, isSilent);

+ 1 - 0
web/maintain/report/js/rpt_tpl_pre_handle.js

@@ -251,6 +251,7 @@ let preHandleObj = {
         let me = preHandleObj;
         me.currentNode = treeNode;
         me.setDisabledBandSelect([2,3,4]);
+        // me.setDisabledBandSelect([]);
         me.refreshByNode(treeNode);
     },
     onTypeClick: function(event,treeId,treeNode) {

+ 1 - 1
web/maintain/report/rpt_tpl_detail_mapping_fields.html

@@ -1,7 +1,7 @@
 <div class="tab-pane" id="rpttplfieldmap" role="tabpanel">
     <div class="main-data">
         <div class="p-3">
-            <label>报表映射指标</label>
+            <label>报表映射指标(勾选表示:主从关系的ID关联指标)</label>
             <div class="tab-content">
                 <ul id="field_map_tree_reversed" class="ztree"></ul>
             </div>