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

安全计量,报表,所有审批操作问题

MaiXinRong 3 недель назад
Родитель
Сommit
0021f53a98
4 измененных файлов с 19 добавлено и 4 удалено
  1. 1 1
      app/controller/report_controller.js
  2. 2 2
      app/lib/rm/phase_pay.js
  3. 1 1
      app/service/report.js
  4. 15 0
      config/web.js

+ 1 - 1
app/controller/report_controller.js

@@ -720,7 +720,7 @@ module.exports = app => {
                     auditConst: auditConst.common,
                     auditConst: auditConst.common,
                     ledgerAuditConst: auditConst.ledger,
                     ledgerAuditConst: auditConst.ledger,
                     auditType: auditConst.auditType,
                     auditType: auditConst.auditType,
-                    jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.report.main),
+                    jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.report.commonAudit),
                     customSelects,
                     customSelects,
                     rptCustomType: reportConst.rptCustomType,
                     rptCustomType: reportConst.rptCustomType,
                     advanceList: JSON.stringify([]),
                     advanceList: JSON.stringify([]),

+ 2 - 2
app/lib/rm/phase_pay.js

@@ -19,8 +19,8 @@ class rptMemChange extends RptMemBase {
 
 
     async doCheckPhasePay(phase_pay_id) {
     async doCheckPhasePay(phase_pay_id) {
         if (this.ctx.phasePay) return;
         if (this.ctx.phasePay) return;
-        this.ctx.phasePay = await this.ctx.service.safeStage.getPhasePay(phase_pay_id);
-        await this.service.phasePay.doCheckPhase(this.ctx.phasePay);
+        this.ctx.phasePay = await this.ctx.service.phasePay.getPhasePay(phase_pay_id);
+        await this.ctx.service.phasePay.doCheckPhase(this.ctx.phasePay);
     }
     }
 
 
     async doCheckTender(tenderId) {
     async doCheckTender(tenderId) {

+ 1 - 1
app/service/report.js

@@ -805,7 +805,7 @@ module.exports = app => {
         }
         }
 
 
         // params = { phase_pay_id: uuid }
         // params = { phase_pay_id: uuid }
-        async safe_stage(params, sourceFilters, memFieldKeys, customDefine, customSelect) {
+        async phase_pay(params, sourceFilters, memFieldKeys, customDefine, customSelect) {
             const RptPhasePay = require('../lib/rm/phase_pay');
             const RptPhasePay = require('../lib/rm/phase_pay');
             const rptPhasePay = new RptPhasePay(this.ctx);
             const rptPhasePay = new RptPhasePay(this.ctx);
 
 

+ 15 - 0
config/web.js

@@ -951,6 +951,21 @@ const JsFiles = {
                 ],
                 ],
                 mergeFile: 'report_main',
                 mergeFile: 'report_main',
             },
             },
+            commonAudit: {
+                files: ['/public/js/spreadjs/sheets/v11/gc.spread.sheets.all.11.2.2.min.js', '/public/js/decimal.min.js', '/public/js/moment/moment.min.js', '/public/js/component/menu.js'],
+                mergeFiles: [
+                    '/public/js/zh_calc.js',
+                    '/public/js/path_tree.js',
+                    '/public/js/spreadjs_rela/spreadjs_zh.js',
+                    '/public/js/shares/tenders2tree.js',
+                    '/public/report/js/rpt_custom.js',
+                    '/public/js/shares/common_audit.js',
+                    '/public/report/js/rpt_change_rela.js',
+                    '/public/report/js/rpt_other_stage.js',
+                    '/public/report/js/rpt_show_level.js',
+                ],
+                mergeFile: 'report_common_audit',
+            },
         },
         },
         advance: {
         advance: {
             main: {
             main: {