|
@@ -506,7 +506,13 @@ module.exports = app => {
|
|
responseData.data.pos = await ctx.service.pos.getPosData({ tid: ctx.tender.id });
|
|
responseData.data.pos = await ctx.service.pos.getPosData({ tid: ctx.tender.id });
|
|
// 获取所选期数据并合并相加同类清单项
|
|
// 获取所选期数据并合并相加同类清单项
|
|
if (ctx.material.is_stage_self && data.sid) {
|
|
if (ctx.material.is_stage_self && data.sid) {
|
|
- responseData.data.curLedgerData = await ctx.service.stageBills.getStagesData(ctx.tender.id, data.sid.toString());
|
|
|
|
|
|
+ const curLedgerPcData = await ctx.service.stageBillsPc.getStagesData(ctx.tender.id, data.sid.toString());
|
|
|
|
+ const curLedgerData = await ctx.service.stageBills.getStagesData(ctx.tender.id, data.sid.toString());
|
|
|
|
+ for (const cl of curLedgerData) {
|
|
|
|
+ const clpc = ctx.helper._.find(curLedgerPcData, { lid: cl.lid });
|
|
|
|
+ ctx.helper._.assign(cl, clpc);
|
|
|
|
+ }
|
|
|
|
+ responseData.data.curLedgerData = curLedgerData;
|
|
responseData.data.curPosData = await ctx.service.stagePos.getStagesData(ctx.tender.id, data.sid.toString(), 'list');
|
|
responseData.data.curPosData = await ctx.service.stagePos.getStagesData(ctx.tender.id, data.sid.toString(), 'list');
|
|
const ledgerListData = [];
|
|
const ledgerListData = [];
|
|
const posListData = [];
|
|
const posListData = [];
|