报表数据相关

app/lib/rm/payment_safe.js

@@ -34,8 +34,8 @@ class rptMemPaymentSafe extends RptMemBase {
 
     async getSafeBills() {
         const bills = this.ctx.detail.readOnly
-            ? await ctx.service.paymentSafeBills.getReadData(ctx.detail)
-            : await ctx.service.paymentSafeBills.getEditData(ctx.detail);
+            ? await this.ctx.service.paymentSafeBills.getReadData(this.ctx.detail)
+            : await this.ctx.service.paymentSafeBills.getEditData(this.ctx.detail);
         const setting = {
             id: 'tree_id',
             pid: 'tree_pid',
@@ -49,7 +49,7 @@ class rptMemPaymentSafe extends RptMemBase {
         const billsTree = new Ledger.billsTree(this.ctx, setting);
         billsTree.loadDatas(bills);
         billsTree.calculateAll();
-        return billsTree.getDefaultData();
+        return billsTree.getDefaultDatas();
     }
     _analysisCompareData(datas, roles){
         const findHis = function (role, history) {
@@ -87,8 +87,8 @@ class rptMemPaymentSafe extends RptMemBase {
         }
     }
     async getSafeBillsCompare() {
-        const bills = await ctx.service.paymentSafeBills.getCompareData(ctx.detail);
-        const roles = await ctx.service.paymentDetailAudit.getViewFlow(ctx.detail);
+        const bills = await this.ctx.service.paymentSafeBills.getCompareData(this.ctx.detail);
+        const roles = await this.ctx.service.paymentDetailAudit.getViewFlow(this.ctx.detail);
         this._analysisCompareData(bills, roles);
         const setting = {
             id: 'tree_id',
@@ -104,14 +104,14 @@ class rptMemPaymentSafe extends RptMemBase {
         const compareTree = new Ledger.billsTree(this.ctx, setting);
         compareTree.loadDatas(bills);
         compareTree.calculateAll();
-        return compareTree.getDefaultData();
+        return compareTree.getDefaultDatas();
     }
 
     getCommonData(params, tableName, fields) {
         switch (tableName) {
             case 'mem_payment_tender':
                 return this.ctx.paymentTender;
-            case 'mem_payment_tender':
+            case 'mem_payment_tender_info':
                 return this.ctx.service.paymentTenderInfo.getTenderInfo(params.tender_id);
             case 'mem_payment_detail':
                 return this.ctx.detail;

app/service/payment_detail.js

@@ -338,6 +338,7 @@ module.exports = app => {
         }
 
         async doCheckDetail(id) {
+            const status = auditConst.status;
             const accountId = this.ctx.session.sessionUser.accountId;
             const auditPermission = await this.service.paymentPermissionAudit.getOnePermission(this.ctx.session.sessionUser.is_admin, accountId);
             if (!auditPermission) throw '权限不足';
@@ -351,7 +352,7 @@ module.exports = app => {
             detail.auditors = await this.ctx.service.paymentDetailAudit.getAuditors(detail.id, detail.times);
             detail.curAuditor = await this.ctx.service.paymentDetailAudit.getCurAuditor(detail.id, detail.times);
             detail.rptAudits = await this.ctx.service.paymentRptAudit.getListByDetail(detail.id);
-            const auditorIds = _.map(detail.auditors, 'aid'), rptAuditIds = _.map(detail.rptAudits, 'uid');
+            const auditorIds = this._.map(detail.auditors, 'aid'), rptAuditIds = this._.map(detail.rptAudits, 'uid');
 
             if (accountId === detail.uid) { // 原报
                 detail.curTimes = detail.times;