Просмотр исходного кода

fix: 标段合同的输出报表入口调整

Tony Kang 2 месяцев назад
Родитель
Сommit
2f78046794
3 измененных файлов с 10 добавлено и 6 удалено
  1. 8 5
      app/controller/report_controller.js
  2. 1 0
      app/router.js
  3. 1 1
      app/view/contract/sub_menu_list.ejs

+ 8 - 5
app/controller/report_controller.js

@@ -1118,7 +1118,7 @@ module.exports = app => {
             await this._indexForBGL(ctx, sourceTypeConst.sourceType.change_apply, -303);
         }
 
-        async _indexForContract(ctx, source_type, stage_id, preUrl) {
+        async _indexForContract(ctx, source_type, stage_id, preUrl, thisUrl) {
             // 合同管理报表入口(项目、标段级别)
             try {
                 await this._getStageAuditViewData(ctx);
@@ -1218,7 +1218,7 @@ module.exports = app => {
                     used_list: JSON.stringify(usedList),
                     tenderMenu,
                     preUrl,
-                    thisUrl: `/sp/${ctx.params.id}/contract/detail`, // 合同专有
+                    thisUrl,
                     measureType,
                     categoryData,
                     tenderList,
@@ -1259,14 +1259,17 @@ module.exports = app => {
         }
 
         async indexForProjectContract(ctx) {
-            const preUrl = `/sp/${ctx.params.prjid}/contract/panel`;
-            await this._indexForContract(ctx, sourceTypeConst.sourceType.contract, -600, preUrl);
+            // const preUrl = `/sp/${ctx.params.prjid}/contract/panel`;
+            const preUrl = '';
+            const thisUrl = `/sp/${ctx.params.id}/contract/detail`;
+            await this._indexForContract(ctx, sourceTypeConst.sourceType.contract, -600, preUrl, thisUrl);
         }
 
         async indexForTenderContract(ctx) {
             // const preUrl = `/sp/${ctx.params.prjid}/contract/panel`;
             const preUrl = '';
-            await this._indexForContract(ctx, sourceTypeConst.sourceType.contract, -600, preUrl);
+            const thisUrl = `/sp/${ctx.params.id}/contract/tender/${ctx.params.tid}/detail`;
+            await this._indexForContract(ctx, sourceTypeConst.sourceType.contract, -600, preUrl, thisUrl);
         }
 
         /**

+ 1 - 0
app/router.js

@@ -913,6 +913,7 @@ module.exports = app => {
     // app.get('/sp/:prjid/contract/report', sessionAuth, subProjectCheck, 'reportController.indexForProjectContract');
     // app.get('/sp/:id/contract/panel', sessionAuth, subProjectCheck, contractCheck, 'contractController.panel');
     app.get('/sp/:id/contract/report', sessionAuth, subProjectCheck, contractCheck, 'reportController.indexForProjectContract');
+    app.get('/sp/:id/contract/tender/:tid/report', sessionAuth, subProjectCheck, contractCheck, 'reportController.indexForTenderContract');
     // app.get('/sp?/contract/report', sessionAuth, tenderCheck, subProjectCheck, uncheckTenderCheck, 'reportController.indexForTenderContract');
     app.get('/sp/:id/payment/:pid/safe/:did/report', sessionAuth, subProjectCheck, paymentTenderCheck, paymentDetailCheck, 'reportController.indexForPaymentSafe');
     app.get('/budget/:id/report', sessionAuth, budgetCheck, 'reportController.indexForDynamicGrandTotal');

+ 1 - 1
app/view/contract/sub_menu_list.ejs

@@ -23,7 +23,7 @@
 <div class="nav-box">
     <ul class="nav-list list-unstyled">
         <li class="<% if (ctx.url.includes('/contract/report')) { %>active<% } %>">
-            <a href="/sp/<%- `${ctx.subProject.id}` %>/contract/report"><span class="ml-3">输出报表</span></a>
+            <a href="<%- `/sp/${ctx.subProject.id}` + (ctx.contract_tender ? `/contract/tender/${ctx.contract.id}/report` : '/contract/report') %>"><span class="ml-3">输出报表</span></a>
         </li>
     </ul>
 </div>