变更令相关界面调整

app/controller/report_controller.js

@@ -319,6 +319,10 @@ module.exports = app => {
                     source_type: 1,
                     changes: 'null',
                     changeId: '-1',
+                    cPlanId: -1,
+                    cPrjId: -1,
+                    cAplId: -1,
+
                 };
                 await this.layout('report/index.ejs', renderData, 'report/rpt_all_popup.ejs');
                 // await this.layout('report/index.ejs', renderData);
@@ -469,6 +473,9 @@ module.exports = app => {
                     source_type: 101,
                     changes: 'null',
                     changeId: '-1',
+                    cPlanId: -1,
+                    cPrjId: -1,
+                    cAplId: -1,
                 };
                 /*
                 //*/
@@ -611,6 +618,9 @@ module.exports = app => {
                     source_type: 200,
                     changes: 'null',
                     changeId: '-1',
+                    cPlanId: -1,
+                    cPrjId: -1,
+                    cAplId: -1,
                 };
                 await this.layout('report/index.ejs', renderData, 'report/rpt_all_popup.ejs');
 
@@ -629,6 +639,9 @@ module.exports = app => {
                 pageShow.closeShowAllCustomized = 0;
                 const tenderId = ctx.params.id;
                 const changeId = ctx.params.cid;
+                const cPlanId = ctx.params.cplnid || -1;
+                const cPrjId = ctx.params.cprjid || -1;
+                const cAplId = ctx.params.caid || -1;
                 let bzId = '';
                 if (stage_id === -300) bzId = changeId;
                 const paymentDetail_id = -1;
@@ -768,6 +781,9 @@ module.exports = app => {
                     source_type,
                     changes: JSON.stringify(changes),
                     changeId,
+                    cPlanId,
+                    cPrjId,
+                    cAplId,
                 };
                 await this.layout('report/index.ejs', renderData, 'report/rpt_all_popup.ejs');
             } catch (err) {

app/router.js

@@ -452,9 +452,9 @@ module.exports = app => {
     // 报表
     app.get('/tender/:id/report', sessionAuth, tenderCheck, uncheckTenderCheck, 'reportController.index');
     app.get('/tender/:id/change/:cid/report', sessionAuth, tenderCheck, uncheckTenderCheck, 'reportController.indexForChange');
-    app.get('/tender/:id/change/plan/report', sessionAuth, tenderCheck, uncheckTenderCheck, 'reportController.indexForChangePlan');
-    app.get('/tender/:id/change/project/report', sessionAuth, tenderCheck, uncheckTenderCheck, 'reportController.indexForChangeProject');
-    app.get('/tender/:id/change/apply/report', sessionAuth, tenderCheck, uncheckTenderCheck, 'reportController.indexForChangeApply');
+    app.get('/tender/:id/change/plan/:cplnid/report', sessionAuth, tenderCheck, uncheckTenderCheck, 'reportController.indexForChangePlan');
+    app.get('/tender/:id/change/project/:cprjid/report', sessionAuth, tenderCheck, uncheckTenderCheck, 'reportController.indexForChangeProject');
+    app.get('/tender/:id/change/apply/:caid/report', sessionAuth, tenderCheck, uncheckTenderCheck, 'reportController.indexForChangeApply');
     app.get('/tender/:id/measure/stage/:order/report', sessionAuth, tenderCheck, uncheckTenderCheck, stageCheck, 'reportController.index');
     app.get('/payment/:id/safe/:did/report', sessionAuth, paymentTenderCheck, paymentDetailCheck, 'reportController.indexForPaymentSafe');
     app.get('/budget/:id/report', sessionAuth, budgetCheck, 'reportController.indexForDynamicGrandTotal');

app/view/change/apply_information.ejs

@@ -7,7 +7,7 @@
                 <div class="d-inline-block">
                     <div class="btn-group btn-group-toggle group-tab">
                         <a class="btn btn-sm btn-light active" href="javascript:void(0);">申请详情</a>
-                        <a class="btn btn-sm btn-light" href="/tender/<%- ctx.tender.id %>/change/apply/<%- ctx.change.id %>/information/report">输出报表</a>
+                        <a class="btn btn-sm btn-light" href="/tender/<%- ctx.tender.id %>/change/apply/<%- ctx.change.id %>/report">输出报表</a>
                     </div>
                 </div>
 <!--                <div class="d-inline-block">-->

app/view/change/apply_information_notice.ejs

@@ -7,7 +7,7 @@
                 <div class="d-inline-block">
                     <div class="btn-group btn-group-toggle group-tab">
                         <a class="btn btn-sm btn-light active" href="javascript:void(0);">申请详情</a>
-                        <a class="btn btn-sm btn-light" href="/tender/<%- ctx.tender.id %>/change/apply/<%- ctx.change.id %>/information/report">输出报表</a>
+                        <a class="btn btn-sm btn-light" href="/tender/<%- ctx.tender.id %>/change/apply/<%- ctx.change.id %>/report">输出报表</a>
                     </div>
                 </div>
 <!--                <div class="d-inline-block">-->

app/view/change/plan_information.ejs

@@ -7,7 +7,7 @@
                 <div class="d-inline-block">
                     <div class="btn-group btn-group-toggle group-tab">
                         <a class="btn btn-sm btn-light active" href="javascript:void(0);">方案详情</a>
-                        <a class="btn btn-sm btn-light" href="/tender/<%- ctx.tender.id %>/change/plan/<%- ctx.change.id %>/information/report">输出报表</a>
+                        <a class="btn btn-sm btn-light" href="/tender/<%- ctx.tender.id %>/change/plan/<%- ctx.change.id %>/report">输出报表</a>
                     </div>
                 </div>
 <!--                <div class="d-inline-block">-->

app/view/change/project_information.ejs

@@ -7,7 +7,7 @@
                 <div class="d-inline-block">
                     <div class="btn-group btn-group-toggle group-tab">
                         <a class="btn btn-sm btn-light active" href="javascript:void(0);">立项详情</a>
-                        <a class="btn btn-sm btn-light" href="/tender/<%- ctx.tender.id %>/change/project/<%- ctx.change.id %>/information/report">输出报表</a>
+                        <a class="btn btn-sm btn-light" href="/tender/<%- ctx.tender.id %>/change/project/<%- ctx.change.id %>/report">输出报表</a>
                     </div>
                 </div>
 <!--                <div class="d-inline-block">-->

app/view/report/index.ejs

@@ -47,7 +47,18 @@
                 </div>
                 -->
                 <div class="btn-group btn-group-toggle group-tab">
+                    <% if ([-300].includes(stg_id)) { %>
                     <a class="btn btn-sm btn-light" href="/tender/<%- tender_id %>/change/<%- changeId %>/information">变更详情</a>
+                    <% } %>
+                    <% if ([-301].includes(stg_id)) { %>
+                    <a class="btn btn-sm btn-light" href="/tender/<%- tender_id %>/change/plan/<%- cPlanId %>/information">方案详情</a>
+                    <% } %>
+                    <% if ([-302].includes(stg_id)) { %>
+                    <a class="btn btn-sm btn-light" href="/tender/<%- tender_id %>/change/project/<%- cPrjId %>/information">立项详情</a>
+                    <% } %>
+                    <% if ([-303].includes(stg_id)) { %>
+                    <a class="btn btn-sm btn-light" href="/tender/<%- tender_id %>/change/apply/<%- cAplId %>/information">申请详情</a>
+                    <% } %>
                     <a class="btn btn-sm btn-light active" href="javascript:void(0);">输出报表</a>
                 </div>
                 <% } %>

app/view/report/index_archive.ejs

@@ -13,6 +13,19 @@
             <% } %>
             <div>
                 <div class="d-inline-block">
+                    <div class="dropdown">
+                        <button class="btn btn-sm btn-light dropdown-toggle text-primary" type="button" id="bizDropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                            计量期
+                        </button>
+                        <div class="dropdown-menu" aria-labelledby="bizDropdownMenuButton">
+                            <a class="dropdown-item" href="#">变更令</a>
+                            <a class="dropdown-item" href="#">变更立项</a>
+                            <a class="dropdown-item" href="#">变更方案</a>
+                            <a class="dropdown-item" href="#">变更申请</a>
+                        </div>
+                    </div>
+                </div>
+                <div class="d-inline-block">
                     <div class="dropdown" id="divSelectableStages">
                         <button class="btn btn-sm btn-light dropdown-toggle text-primary" type="button" id="btnCurrentStage" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
                         <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" id="optionSelectableStages"></div>

app/view/report/rpt_all_popup.ejs

@@ -740,7 +740,7 @@
         </div>
     </div>
 </div>
-<% if (stg_id !== -100 && stg_id !== -200 && stg_id !== -300) { %>
+<% if (![-100, -200, -300, -301, -302, -303].includes(stg_id)) { %>
 <% include ../stage/audit_modal.ejs %>
 <% } %>