Browse Source

urgent fix

TonyKang 5 years ago
parent
commit
d086b8c1b6

+ 7 - 3
app/controller/report_controller.js

@@ -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':

+ 1 - 1
app/reports/util/rpt_calculation_data_util.js

@@ -784,7 +784,7 @@ function assembleFields(fieldList, rstDataArr, $PROJECT) {
                         vrst.splice(0,1);
                     }
                 } else if (field.Precision.type === 'flexible') {
-                    console.log('field.Precision.flexibleMapExpression: ' + field.Precision.flexibleMapExpression);
+                    // console.log('field.Precision.flexibleMapExpression: ' + field.Precision.flexibleMapExpression);
                     const vrst = eval(field.Precision.flexibleMapExpression);
                     if (vrst && vrst.length === 1) {
                         const tmpFlexObj = []; // 计量的动态精度对象与建筑/养护有所不同,需要重新生成