Przeglądaj źródła

fix: 计量管理签名印章显示及业务按钮显示问题

Tony Kang 3 miesięcy temu
rodzic
commit
ddc9c402a9

+ 3 - 2
app/controller/report_controller.js

@@ -988,11 +988,12 @@ module.exports = app => {
                     used_list: JSON.stringify(usedList),
                     used_list: JSON.stringify(usedList),
                     tenderMenu,
                     tenderMenu,
                     // preUrl,
                     // preUrl,
-                    // thisUrl,
+                    // thisUrl,\
+                    auditType: auditConst.auditType,
                     measureType,
                     measureType,
                     categoryData,
                     categoryData,
                     tenderList,
                     tenderList,
-                    auditConst: auditConst.stage,
+                    auditConst: auditConst.common,
                     ledgerAuditConst: auditConst.ledger,
                     ledgerAuditConst: auditConst.ledger,
                     jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.report.main),
                     jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.report.main),
                     customSelects,
                     customSelects,

+ 1 - 1
app/view/report/index.ejs

@@ -181,7 +181,7 @@
                                     导出报表
                                     导出报表
                                 </div>
                                 </div>
                             </div>
                             </div>
-                            <% if(![-600].includes(stg_id)) { %>
+                            <% if(![-600, -700].includes(stg_id)) { %>
                             <div class="panel" id="archiveTopDiv" <% if (pageShow === null || parseInt(pageShow.showArchive) === 0 || isNaN(parseInt(pageShow.showArchive))) { %> style="display:none" <% } %>>
                             <div class="panel" id="archiveTopDiv" <% if (pageShow === null || parseInt(pageShow.showArchive) === 0 || isNaN(parseInt(pageShow.showArchive))) { %> style="display:none" <% } %>>
                                 <div class="panel-body">
                                 <div class="panel-body">
                                     <div class="btn-group" role="group">
                                     <div class="btn-group" role="group">

+ 4 - 1
app/view/report/rpt_all_popup.ejs

@@ -815,11 +815,14 @@
 </div>
 </div>
 
 
 <% if (![-100, -150, -200, -300, -301, -302, -303, -600, -700].includes(stg_id)) { %>
 <% if (![-100, -150, -200, -300, -301, -302, -303, -600, -700].includes(stg_id)) { %>
-<% include ../stage/audit_modal.ejs %>
+    <% include ../stage/audit_modal.ejs %>
 <% } %>
 <% } %>
 <% if (stg_id === -150) { %>
 <% if (stg_id === -150) { %>
     <% include ../safe_calc/audit_modal.ejs %>
     <% include ../safe_calc/audit_modal.ejs %>
 <% } %>
 <% } %>
+<% if (stg_id === -700) { %>
+    <% include ../phase_pay/audit_modal.ejs %>
+<% } %>
 
 
 <script>
 <script>
     zTreeOprObj.getCustomerCfg();
     zTreeOprObj.getCustomerCfg();