Browse Source

变更令报表界面sync

Tony Kang 1 year ago
parent
commit
55605290e6

+ 2 - 2
app/controller/report_controller.js

@@ -702,7 +702,7 @@ module.exports = app => {
                 pageShow.showArchive = 1;
                 pageShow.closeShowAllCustomized = 0;
                 const tenderId = ctx.params.id;
-                const cId = ctx.params.cid;
+                const changeId = ctx.params.cid;
                 const paymentDetail_id = -1;
                 const pid = ctx.session.sessionProject.id;
                 const budget_id = -1;
@@ -850,7 +850,7 @@ module.exports = app => {
                     viewPmData: PermissionCheck.viewPmData(this.ctx.session.sessionUser.permission),
                     source_type,
                     changes: JSON.stringify(changes),
-                    changeId: cId,
+                    changeId,
                 };
                 await this.layout('report/index.ejs', renderData, 'report/rpt_all_popup.ejs');
             } catch (err) {

+ 2 - 0
app/public/report/js/rpt_change.js

@@ -8,6 +8,7 @@
 const rptChangeObj = {
     initBglList: function() {
         // 初始化变更令ID值 ALL_CHANGES bglKeyVals
+        /*
         if (ALL_CHANGES) {
             const $bglDivDom = $('#bglKeyVals');
             $bglDivDom.empty();
@@ -18,6 +19,7 @@ const rptChangeObj = {
             });
             $bglDivDom.append(content);
         }
+        //*/
     },
     changeBglId: function(index) {
         const change = ALL_CHANGES[index];

+ 1 - 1
app/view/change/information.ejs

@@ -8,7 +8,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/<%- ctx.change.cid %>/information/report">输出报表</a>
+                            <a class="btn btn-sm btn-light" href="/tender/<%- ctx.tender.id %>/change/<%- ctx.change.cid %>/report">输出报表</a>
                         </div>
                     </div>
                 </div>

+ 6 - 0
app/view/report/index.ejs

@@ -38,12 +38,18 @@
                 </div>
                 <% } %>
                 <% if (stg_id === -300) { %>
+                <!--
                 <div class="d-inline-block">
                     <div class="dropdown">
                         <button class="btn btn-sm btn-light dropdown-toggle text-primary" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">变更令</button>
                         <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" id="bglKeyVals"></div>
                     </div>
                 </div>
+                -->
+                <div class="btn-group btn-group-toggle group-tab">
+                    <a class="btn btn-sm btn-light" href="/tender/<%- tender_id %>/change/<%- changeId %>/information">变更详情</a>
+                    <a class="btn btn-sm btn-light active" href="javascript:void(0);">输出报表</a>
+                </div>
                 <% } %>
                 <% if (false || (stg_id !== -100 && stg_id !== -200 && stg_id !== -300)) { %>
                 <% if (ctx.session.sessionProject.page_show.isPreset) { %>