支付审批路由问题

app/controller/report_controller.js

@@ -416,7 +416,7 @@ module.exports = app => {
                 pageShow.showArchive = 0;
                 // pageShow.closeWatermark = 1;
                 pageShow.closeShowAllCustomized = 0;
-                const tenderId = ctx.params.id;
+                const tenderId = ctx.params.pid;
                 const paymentDetail_id = ctx.params.did;
                 // 支付审批: ctx.params.did 是 zh_payment_detail表的id, 通过这个did在 zh_payment_detail_audit表里找审核信息(td_id = ctx.params.did)
                 //          没有计量期的概念！！！
@@ -446,7 +446,7 @@ module.exports = app => {
                     prjAccList = newAccList;
                 }
                 // 分类列表 todo 支付审批 目前没有所属子项目，自定义分类暂无法按所属子项目取值
-                const categoryData = await this.ctx.service.category.getAllCategory(this.ctx.session.sessionProject.id);
+                const categoryData = await this.ctx.service.category.getAllCategory(this.ctx.subProject.id);
                 // 获取用户权限
                 const accountInfo = await this.ctx.service.projectAccount.getDataById(this.ctx.session.sessionUser.accountId);
                 // const userPermission = accountInfo !== undefined && accountInfo.permission !== '' ? JSON.parse(accountInfo.permission) : null;

app/router.js

@@ -759,7 +759,7 @@ module.exports = app => {
     app.get('/tender/:id/change/project/:cprjid/report', sessionAuth, tenderCheck, subProjectCheck, uncheckTenderCheck, 'reportController.indexForChangeProject');
     app.get('/tender/:id/change/apply/:caid/report', sessionAuth, tenderCheck, subProjectCheck, uncheckTenderCheck, 'reportController.indexForChangeApply');
     app.get('/tender/:id/measure/stage/:order/report', sessionAuth, tenderCheck, subProjectCheck, uncheckTenderCheck, stageCheck, 'reportController.index');
-    app.get('/payment/:id/safe/:did/report', sessionAuth, paymentTenderCheck, paymentDetailCheck, 'reportController.indexForPaymentSafe');
+    app.get('/sp/:id/payment/:pid/safe/:did/report', sessionAuth, subProjectCheck, paymentTenderCheck, paymentDetailCheck, 'reportController.indexForPaymentSafe');
     app.get('/budget/:id/report', sessionAuth, budgetCheck, 'reportController.indexForDynamicGrandTotal');
     app.get('/tender/:id/archiveReport', sessionAuth, tenderCheck, subProjectCheck, 'reportArchiveController.index');
     app.post('/tender/report_api/getReportArchive', sessionAuth, 'reportArchiveController.getReportArchive');

app/view/dashboard/index.ejs

@@ -1,7 +1,7 @@
 <div class="panel-content">
     <div class="panel-title fluid">
         <div class="title-main d-flex">
-            <h2><%= ctx.session.sessionProject.name %></h2>
+            <h2><%= ctx.subProject.name %></h2>
             <div class="ml-auto">
                 <i class="fa fa-bell mr-1"></i><a href="#version" data-toggle="modal" data-target="#version">当前版本：<%= versionList[0].name %></a>
                 <% if (sysMsgList.length > 0) { %>

app/view/payment_safe/sub_menu_list.ejs

@@ -1,4 +1,4 @@
-<nav-menu title="返回" url="/payment/<%- ctx.paymentTender.id  %>/list" tclass="text-primary" ml="1" icon="fa-chevron-left"></nav-menu>
-<nav-menu title="安全生产费" url="/payment/<%- ctx.paymentTender.id %>/safe/<%= ctx.detail.id %>/bills" ml="3" active="<%= ctx.url.indexOf('bills') %>"></nav-menu>
-<nav-menu title="审核比较" url="/payment/<%- ctx.paymentTender.id %>/safe/<%= ctx.detail.id %>/compare" ml="3" active="<%= ctx.url.indexOf('compare') %>"></nav-menu>
-<nav-menu title="输出报表" url="/payment/<%- ctx.paymentTender.id %>/safe/<%= ctx.detail.id %>/report" ml="3" active="<%= ctx.url.indexOf('report') %>"></nav-menu>
+<nav-menu title="返回" url="/sp/<%- ctx.subProject.id %>/payment/<%- ctx.paymentTender.id  %>/list" tclass="text-primary" ml="1" icon="fa-chevron-left"></nav-menu>
+<nav-menu title="安全生产费" url="/sp/<%- ctx.subProject.id %>/payment/<%- ctx.paymentTender.id %>/safe/<%= ctx.detail.id %>/bills" ml="3" active="<%= ctx.url.indexOf('bills') %>"></nav-menu>
+<nav-menu title="审核比较" url="/sp/<%- ctx.subProject.id %>/payment/<%- ctx.paymentTender.id %>/safe/<%= ctx.detail.id %>/compare" ml="3" active="<%= ctx.url.indexOf('compare') %>"></nav-menu>
+<nav-menu title="输出报表" url="/sp/<%- ctx.subProject.id %>/payment/<%- ctx.paymentTender.id %>/safe/<%= ctx.detail.id %>/report" ml="3" active="<%= ctx.url.indexOf('report') %>"></nav-menu>