Sfoglia il codice sorgente

金额概况,计量进度,审批流程相关

MaiXinRong 9 mesi fa
parent
commit
7ffb7b8378
2 ha cambiato i file con 5 aggiunte e 22 eliminazioni
  1. 4 21
      app/controller/ledger_controller.js
  2. 1 1
      app/view/tender/modal.ejs

+ 4 - 21
app/controller/ledger_controller.js

@@ -768,27 +768,10 @@ module.exports = app => {
          */
         async ledgerAuditors(ctx) {
             try {
-                const responseData = {
-                    err: 0, msg: '', data: {},
-                };
-                const tender = ctx.tender;
-                const times = tender.data.ledger_status === auditConst.status.checkNo ? tender.data.ledger_times - 1 : tender.data.ledger_times;
-                const auditors = tender.data.ledger_status === auditConst.status.checkNo && tender.data.user_id !== ctx.session.sessionUser.accountId && !ctx.tender.isTourist ?
-                    await ctx.service.ledgerAudit.getAuditorsWithOwner(tender.id, times) :
-                    await ctx.service.ledgerAudit.getAuditorsWithOwner(tender.id, tender.data.ledger_times);
-                const user = await ctx.service.projectAccount.getAccountInfoById(ctx.tender.data.user_id);
-                const auditHistory = [];
-                if (times >= 1) {
-                    for (let i = 1; i <= times; i++) {
-                        auditHistory.push(await ctx.service.ledgerAudit.getAuditors(ctx.tender.id, i));
-                    }
-                }
-                responseData.data.auditHistory = auditHistory;
-                // 获取审批流程中左边列表
-                responseData.data.auditors = auditors;
-
-                responseData.data.user = user;
-                ctx.body = responseData;
+                const tender = ctx.tender.data;
+                await ctx.service.ledgerAudit.loadLedgerUser(tender);
+                await ctx.service.ledgerAudit.loadLedgerAuditViewData(tender);
+                ctx.body = {err: 0, msg: '', data: tender};
             } catch (error) {
                 this.log(error);
                 ctx.body = { err: 1, msg: error.toString(), data: null };

+ 1 - 1
app/view/tender/modal.ejs

@@ -446,7 +446,7 @@
                 auditConst2 = JSON.parse('<%- JSON.stringify(auditConst.material) %>');
             }
             postData(url, data, function (result) {
-                if (type === 'stage') {
+                if (type === 'stage' || type === 'ledger') {
                     loadStageHistory(result, auditConst2);
                 } else {
                     loadHistory(result, auditConst2);