|
@@ -271,7 +271,7 @@ module.exports = app => {
|
|
|
const settleStatus = ctx.stage.readySettle ? await ctx.service.settleBills.getAllDataByCondition({ where: { settle_id: ctx.stage.readySettle.id }}) : [];
|
|
|
// 查询截止上期数据
|
|
|
const preStageData = ctx.stage.preCheckedStage ? await ctx.service.stageBillsFinal.getFinalData(ctx.tender.data, ctx.stage.preCheckedStage.order) : [];
|
|
|
- const exprData = !ctx.stage.readOnly ? await ctx.service.expr.getAllDataByCondition({ where: { tid: ctx.stage.tid, calc_module: 'stage' } }) : [];
|
|
|
+ const exprData = await ctx.service.expr.getAllDataByCondition({ where: { tid: ctx.stage.tid, calc_module: 'stage' } });
|
|
|
this.ctx.helper.assignRelaData(ledgerData, [
|
|
|
{ data: dgnData, fields: ['deal_dgn_qty1', 'deal_dgn_qty2', 'c_dgn_qty1', 'c_dgn_qty2'], prefix: '', relaId: 'id' },
|
|
|
{ data: memoData, fields: this.ledgerMemoColumn, prefix: '', relaId: 'id' },
|
|
@@ -419,6 +419,7 @@ module.exports = app => {
|
|
|
responseData.data.spec = spec;
|
|
|
break;
|
|
|
case 'expr':
|
|
|
+ const exprData = await ctx.service.expr.getAllDataByCondition({ where: { tid: ctx.stage.tid, calc_module: 'stage' } });
|
|
|
responseData.data.expr = exprData;
|
|
|
break;
|
|
|
}
|