动态投资独立报表初步

app/controller/report_controller.js

@@ -480,30 +480,24 @@ module.exports = app => {
                 pageShow.showArchive = 1;
                 // pageShow.closeWatermark = 1;
                 pageShow.showArchive = 0;
-                const tenderId = ctx.params.id;
-                // const paymentDetail_id = ctx.params.did;
+                const tenderId = -1;
                 const paymentDetail_id = -1;
-                // 支付审批: ctx.params.did 是 zh_payment_detail表的id, 通过这个did在 zh_payment_detail_audit表里找审核信息(td_id = ctx.params.did)
-                //          没有计量期的概念！！！
-                // const paymentAuditorList = await ctx.service.paymentDetailAudit.getAuditors(paymentDetail_id);
-                const tender = ctx.paymentTender;
-                const pid = -1;
-                // const treeNodes = await ctx.service.rptTreeNode.getNodesByProjectId([-1, tender.pid]);
-                const treeNodes = await ctx.service.rptTreeNode.getNodesBySourceType([tender.pid], 200); //
+                // const tender = ctx.paymentTender;
+                const pid = ctx.budget.pid;
+                const treeNodes = await ctx.service.rptTreeNode.getNodesBySourceType([pid], 200); //
                 // 加一个dummy的通用报表
                 const dummyCommonRptNode = { id: 1, name: '通用报表', pid: -1, rpt_type: 0, items: '[]', hidden: true };
                 treeNodes.push(dummyCommonRptNode);
                 // const custTreeNodes = await ctx.service.rptTreeNodeCust.getCustFoldersByUserId(this.ctx.session.sessionUser.accountId);
                 const custCfg = await ctx.service.rptCustomizeCfg.getCustomizeCfgByUserId('Administrator');
-                // const stageList = await ctx.service.stage.getValidStagesShort(tender.id);
                 const stageList = [];
-                const unitList = await ctx.service.constructionUnit.getAllDataByCondition({ where: { pid: tender.pid } }); // 找公司章用的
+                const unitList = await ctx.service.constructionUnit.getAllDataByCondition({ where: { pid } }); // 找公司章用的
                 const isAdmin = ctx.session.sessionUser.is_admin;
                 const lastAuditor = null;
                 const archiveList = [];
-                let prjAccList = await ctx.service.projectAccount.getAllAccountByProjectId(tender.pid);
-                const roleList = await ctx.service.signatureRole.getSignatureRolesByTenderId(tender.id);
-                const usedList = await ctx.service.signatureUsed.getSignatureUsedByTenderId(tender.id);
+                let prjAccList = await ctx.service.projectAccount.getAllAccountByProjectId(pid);
+                const roleList = [];
+                const usedList = [];
                 // 根据需求，如果开启了‘开启个人「签字」’功能，则只能是本身用户签名，管理员例外
                 if (!ctx.session.sessionUser.is_admin && pageShow.individualSign === 1) {
                     // 削减其他account
@@ -531,22 +525,12 @@ module.exports = app => {
 
                 const materialList = await ctx.service.material.getValidMaterials();
 
-                const stage_id = -100;
+                const stage_id = -200;
                 const stage_order = -1;
                 const sorder = -1;
                 const stage_times = -1;
                 const stage_status = -1;
 
-                // const paymentDetailList = await ctx.service.paymentDetail.getDetail(paymentDetail_id);
-                // if (paymentDetailList && paymentDetailList.length > 0) {
-                //     const payment = paymentDetailList[0];
-                //     stage_status = payment.status;
-                //     stage_order = payment.order;
-                //     sorder = stage_order;
-                //     stage_times = payment.times;
-                //     stageList.push({ id: stage_id, user_id: payment.uid, status: payment.status });
-                // }
-
                 for (const prjAcc of prjAccList) {
                     prjAcc.account_group = accountGroup[prjAcc.account_group];
                 }
@@ -581,9 +565,9 @@ module.exports = app => {
                     rpt_tpl_data: JSON.stringify(treeNodes),
                     cust_tpl_data: rpt_tpl_items,
                     cust_cfg: JSON.stringify(custCfg),
-                    project_id: tender.pid,
+                    project_id: pid,
                     tender_id: tenderId,
-                    tender_name: tender.name,
+                    tender_name: '',
                     detail_id: paymentDetail_id,
                     stg_id: stage_id,
                     stg_order: stage_order,

app/view/report/index.ejs

@@ -2,6 +2,8 @@
     <% include ../tender/tender_sub_menu.ejs %>
 <% } else if (stg_id === -100) { %>
     <% include ../payment_safe/sub_menu.ejs %>
+<% } else if (stg_id === -200) { %>
+    <% include ../budget/sub_menu.ejs %>
 <% } else { %>
     <% include ../stage/stage_sub_menu.ejs %>
 <% } %>
@@ -10,7 +12,7 @@
         <div class="title-main d-flex">
             <% if(stg_id === -1) { %>
                 <% include ../tender/tender_sub_mini_menu.ejs %>
-            <% } else if (stg_id === -100) { %>
+            <% } else if (stg_id === -100 || stg_id === -200) { %>
             <% } else { %>
                 <% include ../stage/stage_sub_mini_menu.ejs %>
             <% } %>