|
@@ -373,7 +373,7 @@ async function getReportData(ctx, params, filters, memFieldKeys) {
|
|
|
runnableKey.push('ledger');
|
|
|
break;
|
|
|
case 'deal_bills' :
|
|
|
- console.log('has push deal_bills! ' + params.tender_id);
|
|
|
+ // console.log('has push deal_bills! ' + params.tender_id);
|
|
|
runnableRst.push(ctx.service.dealBills.getDataByTenderId(params.tender_id));
|
|
|
runnableKey.push('deal_bills');
|
|
|
break;
|
|
@@ -383,7 +383,9 @@ async function getReportData(ctx, params, filters, memFieldKeys) {
|
|
|
break;
|
|
|
case 'stage_bills_final':
|
|
|
await checkStg(ctx, params);
|
|
|
- runnableRst.push(ctx.service.stageBillsFinal.getFinalDataEx(params.tender_id, params.stage_order));
|
|
|
+ const stage = ctx.stage;
|
|
|
+ // runnableRst.push(ctx.service.stageBillsFinal.getFinalDataEx(params.tender_id, params.stage_order));
|
|
|
+ runnableRst.push(ctx.service.stageBillsFinal.getFinalDataEx(params.tender_id, stage.order));
|
|
|
runnableKey.push('stage_bills_final');
|
|
|
break;
|
|
|
case 'stage':
|
|
@@ -392,7 +394,9 @@ async function getReportData(ctx, params, filters, memFieldKeys) {
|
|
|
break;
|
|
|
case 'stage_pay':
|
|
|
await checkStg(ctx, params);
|
|
|
- runnableRst.push(ctx.service.stagePay.getAuditorStageData(params.stage_id, params.stage_times, params.stage_order));
|
|
|
+ const stage2 = ctx.stage;
|
|
|
+ // runnableRst.push(ctx.service.stagePay.getAuditorStageData(params.stage_id, params.stage_times, params.stage_order));
|
|
|
+ runnableRst.push(ctx.service.stagePay.getAuditorStageData(params.stage_id, stage2.times, stage2.order));
|
|
|
runnableKey.push('stage_pay');
|
|
|
break;
|
|
|
case 'mem_stage_im_zl':
|