Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/lib/rm/budget.js

@@ -87,7 +87,7 @@ class rptMemPaymentSafe extends RptMemBase {
     getCommonData(params, tableName, fields, customDefine, customSelect) {
         switch (tableName) {
             case 'mem_info':
-                return this.ctx.subProject.info;
+                return [this.ctx.subProject.info];
             case 'mem_qty_info':
                 return [...this.ctx.subProject.info.main_quantity, ...this.ctx.subProject.info.gcl_quantity];
             case 'mem_budget_gu':

app/lib/rm/change.js

@@ -84,7 +84,7 @@ class rptMemChange extends RptMemBase {
     getCommonData(params, tableName, fields, customDefine, customSelect) {
         switch (tableName) {
             case 'mem_change':
-                return this.ctx.change;
+                return [this.ctx.change];
             case 'mem_change_bills':
                 return this._getChangeBills();
             case 'mem_change_audit':
@@ -94,9 +94,9 @@ class rptMemChange extends RptMemBase {
             case 'mem_project':
                 return this.ctx.service.project.getDataByCondition({ id: this.ctx.session.sessionProject.id });
             case 'mem_tender':
-                return this.ctx.tender.data;
+                return [this.ctx.tender.data];
             case 'mem_tender_info':
-                return this.ctx.tender.info;
+                return [this.ctx.tender.info];
             default:
                 return [];
         }

app/lib/rm/change_apply.js

@@ -58,7 +58,7 @@ class rptMemChange extends RptMemBase {
     getCommonData(params, tableName, fields, customDefine, customSelect) {
         switch (tableName) {
             case 'mem_change_apply':
-                return this.ctx.change_apply;
+                return [this.ctx.change_apply];
             case 'mem_change_apply_bills':
                 return this._getChangeApplyBills();
             case 'mem_change_apply_audit':
@@ -68,9 +68,9 @@ class rptMemChange extends RptMemBase {
             case 'mem_project':
                 return this.ctx.service.project.getDataByCondition({ id: this.ctx.session.sessionProject.id });
             case 'mem_tender':
-                return this.ctx.tender.data;
+                return [this.ctx.tender.data];
             case 'mem_tender_info':
-                return this.ctx.tender.info;
+                return [this.ctx.tender.info];
             default:
                 return [];
         }

app/lib/rm/change_plan.js

@@ -70,7 +70,7 @@ class rptMemChange extends RptMemBase {
     getCommonData(params, tableName, fields, customDefine, customSelect) {
         switch (tableName) {
             case 'mem_change_plan':
-                return this.ctx.change_plan;
+                return [this.ctx.change_plan];
             case 'mem_change_plan_bills':
                 return this._getChangePlanBills();
             case 'mem_change_plan_audit':
@@ -80,9 +80,9 @@ class rptMemChange extends RptMemBase {
             case 'mem_project':
                 return this.ctx.service.project.getDataByCondition({ id: this.ctx.session.sessionProject.id });
             case 'mem_tender':
-                return this.ctx.tender.data;
+                return [this.ctx.tender.data];
             case 'mem_tender_info':
-                return this.ctx.tender.info;
+                return [this.ctx.tender.info];
             default:
                 return [];
         }

app/lib/rm/change_project.js

@@ -41,7 +41,7 @@ class rptMemChange extends RptMemBase {
     getCommonData(params, tableName, fields, customDefine, customSelect) {
         switch (tableName) {
             case 'mem_change_project':
-                return this.ctx.change_project;
+                return [this.ctx.change_project];
             case 'mem_change_project_audit':
                 return this._getChangeProjectAudit();
             case 'mem_change_project_att':
@@ -49,9 +49,9 @@ class rptMemChange extends RptMemBase {
             case 'mem_project':
                 return this.ctx.service.project.getDataByCondition({ id: this.ctx.session.sessionProject.id });
             case 'mem_tender':
-                return this.ctx.tender.data;
+                return [this.ctx.tender.data];
             case 'mem_tender_info':
-                return this.ctx.tender.info;
+                return [this.ctx.tender.info];
             default:
                 return [];
         }

app/lib/rm/payment.js

@@ -34,11 +34,11 @@ class rptMemPaymentSafe extends RptMemBase {
     getCommonData(params, tableName, fields, customDefine, customSelect) {
         switch (tableName) {
             case 'mem_payment_tender':
-                return this.ctx.paymentTender;
+                return [this.ctx.paymentTender];
             case 'mem_payment_tender_info':
                 return this.ctx.service.paymentTenderInfo.getTenderInfo(params.tender_id);
             case 'mem_payment_detail':
-                return this.ctx.detail;
+                return [this.ctx.detail];
             default:
                 return [];
         }

app/lib/rm/payment_safe.js

@@ -110,11 +110,11 @@ class rptMemPaymentSafe extends RptMemBase {
     getCommonData(params, tableName, fields, customDefine, customSelect) {
         switch (tableName) {
             case 'mem_payment_tender':
-                return this.ctx.paymentTender;
+                return [this.ctx.paymentTender];
             case 'mem_payment_tender_info':
                 return this.ctx.service.paymentTenderInfo.getTenderInfo(params.tender_id);
             case 'mem_payment_detail':
-                return this.ctx.detail;
+                return [this.ctx.detail];
             case 'mem_payment_safe_bills':
                 return this.getSafeBills();
             case 'mem_payment_safe_bills_compare':