TASK #4627 前端调整

app/controller/report_controller.js

@@ -84,6 +84,8 @@ module.exports = app => {
                     for (let tIdx = treeNodes.length - 1; tIdx >= 0; tIdx--) {
                         if (filterNames.includes(treeNodes[tIdx].name)) {
                             treeNodes.splice(tIdx, 1);
+                        } else if (treeNodes[tIdx].hasOwnProperty('source_type') && treeNodes[tIdx].source_type !== 1) {
+                            treeNodes.splice(tIdx, 1);
                         }
                     }
                 }
@@ -332,8 +334,16 @@ module.exports = app => {
                 const tender = ctx.paymentTender;
                 // const treeNodes = await ctx.service.rptTreeNode.getNodesByProjectId([-1, tender.pid]);
                 const treeNodes = await ctx.service.rptTreeNode.getNodesBySourceType([tender.pid], 101); //
+                const commonTreeNodes = await ctx.service.rptTreeNode.getNodesByProjectId([-1]); // 这个查通用的
+                const nodeItems = JSON.parse(commonTreeNodes[0].items);
+                const commonArrs = [];
+                nodeItems.forEach(nodeItem => {
+                    if (nodeItem.source_type === 101) {
+                        commonArrs.push(nodeItem);
+                    }
+                });
                 // 加一个dummy的通用报表
-                const dummyCommonRptNode = { id: 1, name: '通用报表', pid: -1, rpt_type: 0, items: '[]', hidden: true };
+                const dummyCommonRptNode = { id: 1, name: '通用报表', pid: -1, rpt_type: 0, items: JSON.stringify(commonArrs) };
                 treeNodes.push(dummyCommonRptNode);
                 // const custTreeNodes = await ctx.service.rptTreeNodeCust.getCustFoldersByUserId(this.ctx.session.sessionUser.accountId);
                 const custCfg = await ctx.service.rptCustomizeCfg.getCustomizeCfgByUserId('Administrator');
@@ -484,9 +494,17 @@ module.exports = app => {
                 const paymentDetail_id = -1;
                 // const tender = ctx.paymentTender;
                 const pid = ctx.budget.pid;
-                const treeNodes = await ctx.service.rptTreeNode.getNodesBySourceType([pid], 200); //
+                const treeNodes = await ctx.service.rptTreeNode.getNodesBySourceType([pid], 200); // 这个查定制的
+                const commonTreeNodes = await ctx.service.rptTreeNode.getNodesByProjectId([-1]); // 这个查通用的
+                const nodeItems = JSON.parse(commonTreeNodes[0].items);
+                const commonArrs = [];
+                nodeItems.forEach(nodeItem => {
+                    if (nodeItem.source_type === 200) {
+                        commonArrs.push(nodeItem);
+                    }
+                });
                 // 加一个dummy的通用报表
-                const dummyCommonRptNode = { id: 1, name: '通用报表', pid: -1, rpt_type: 0, items: '[]', hidden: true };
+                const dummyCommonRptNode = { id: 1, name: '通用报表', pid: -1, rpt_type: 0, items: JSON.stringify(commonArrs) };
                 treeNodes.push(dummyCommonRptNode);
                 // const custTreeNodes = await ctx.service.rptTreeNodeCust.getCustFoldersByUserId(this.ctx.session.sessionUser.accountId);
                 const custCfg = await ctx.service.rptCustomizeCfg.getCustomizeCfgByUserId('Administrator');