BUG #3879

app/controller/report_controller.js

@@ -629,7 +629,8 @@ module.exports = app => {
         async indexForSafeCalc(ctx) {
             // 安全计量入口
             try {
-                await this._getStageAuditViewData(ctx);
+                // await this._getStageAuditViewData(ctx);
+                await this.ctx.service.safeStage.loadAuditViewData(ctx.safeStage);
                 const pageShow = ctx.session.sessionProject.page_show;
                 pageShow.showArchive = 0;
                 pageShow.closeShowAllCustomized = 0;
@@ -714,8 +715,10 @@ module.exports = app => {
                     measureType,
                     categoryData,
                     tenderList,
-                    auditConst: auditConst.stage,
+                    // auditConst: auditConst.stage,
+                    auditConst: auditConst.common,
                     ledgerAuditConst: auditConst.ledger,
+                    auditType: auditConst.auditType,
                     jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.report.main),
                     customSelects,
                     rptCustomType: reportConst.rptCustomType,

app/view/report/rpt_all_popup.ejs

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