|
@@ -128,6 +128,8 @@ module.exports = app => {
|
|
l.org_unit_price = l.unit_price;
|
|
l.org_unit_price = l.unit_price;
|
|
delete l.unit_price;
|
|
delete l.unit_price;
|
|
}
|
|
}
|
|
|
|
+ const extraFields = ['is_tp', 'gxby_status', 'gxby_url', 'gxby_limit', 'dagl_status', 'dagl_url', 'dagl_limit'];
|
|
|
|
+ const extraData = await ctx.service.ledgerExtra.getData(ctx.tender.id, extraFields);
|
|
const dgnData = await ctx.service.stageBillsDgn.getDgnData(relaStage.rela_tid);
|
|
const dgnData = await ctx.service.stageBillsDgn.getDgnData(relaStage.rela_tid);
|
|
const curStageData = await ctx.service.stageRelaBills.getAllDataByCondition({
|
|
const curStageData = await ctx.service.stageRelaBills.getAllDataByCondition({
|
|
where: {sid: ctx.stage.id, rela_tid: relaStage.rela_tid},
|
|
where: {sid: ctx.stage.id, rela_tid: relaStage.rela_tid},
|
|
@@ -136,6 +138,7 @@ module.exports = app => {
|
|
where: {sid: ctx.stage.id, rela_tid: relaStage.rela_tid},
|
|
where: {sid: ctx.stage.id, rela_tid: relaStage.rela_tid},
|
|
});
|
|
});
|
|
this.ctx.helper.assignRelaData(ledgerData, [
|
|
this.ctx.helper.assignRelaData(ledgerData, [
|
|
|
|
+ { data: extraData, fields: extraFields, prefix: '', relaId: 'id' },
|
|
{ data: dgnData, fields: ['deal_dgn_qty1', 'deal_dgn_qty2', 'c_dgn_qty1', 'c_dgn_qty2'], prefix: '', relaId: 'id' },
|
|
{ data: dgnData, fields: ['deal_dgn_qty1', 'deal_dgn_qty2', 'c_dgn_qty1', 'c_dgn_qty2'], prefix: '', relaId: 'id' },
|
|
{ data: curStageData, fields: ['contract_qty', 'contract_expr', 'contract_tp', 'qc_qty', 'qc_tp', 'qc_minus_qty', 'postil'], prefix: '', relaId: 'lid' },
|
|
{ data: curStageData, fields: ['contract_qty', 'contract_expr', 'contract_tp', 'qc_qty', 'qc_tp', 'qc_minus_qty', 'postil'], prefix: '', relaId: 'lid' },
|
|
{ data: endStageData, fields: ['contract_qty', 'contract_tp', 'qc_qty', 'qc_tp', 'qc_minus_qty',], prefix: 'end_', relaId: 'lid' },
|
|
{ data: endStageData, fields: ['contract_qty', 'contract_tp', 'qc_qty', 'qc_tp', 'qc_minus_qty',], prefix: 'end_', relaId: 'lid' },
|
|
@@ -145,6 +148,8 @@ module.exports = app => {
|
|
|
|
|
|
async _getStageRelaPosData(ctx, relaStage) {
|
|
async _getStageRelaPosData(ctx, relaStage) {
|
|
const posData = await ctx.service.pos.getPosData({tid: relaStage.rela_tid});
|
|
const posData = await ctx.service.pos.getPosData({tid: relaStage.rela_tid});
|
|
|
|
+ const extraFields = ['gxby_status', 'gxby_url', 'gxby_limit', 'dagl_status', 'dagl_url', 'dagl_limit'];
|
|
|
|
+ const extraData = await ctx.service.posExtra.getData(ctx.tender.id, extraFields);
|
|
const curStageData = await ctx.service.stageRelaPos.getAllDataByCondition({
|
|
const curStageData = await ctx.service.stageRelaPos.getAllDataByCondition({
|
|
where: {sid: ctx.stage.id, rela_tid: relaStage.rela_tid},
|
|
where: {sid: ctx.stage.id, rela_tid: relaStage.rela_tid},
|
|
});
|
|
});
|
|
@@ -152,6 +157,7 @@ module.exports = app => {
|
|
where: {sid: ctx.stage.id, rela_tid: relaStage.rela_tid},
|
|
where: {sid: ctx.stage.id, rela_tid: relaStage.rela_tid},
|
|
});
|
|
});
|
|
this.ctx.helper.assignRelaData(posData, [
|
|
this.ctx.helper.assignRelaData(posData, [
|
|
|
|
+ { data: extraData, fields: extraFields, prefix: '', relaId: 'id' },
|
|
{ data: curStageData, fields: ['contract_qty', 'contract_expr', 'contract_tp', 'qc_qty', 'qc_tp', 'qc_minus_qty', 'postil'], prefix: '', relaId: 'pid' },
|
|
{ data: curStageData, fields: ['contract_qty', 'contract_expr', 'contract_tp', 'qc_qty', 'qc_tp', 'qc_minus_qty', 'postil'], prefix: '', relaId: 'pid' },
|
|
{ data: endStageData, fields: ['contract_qty', 'contract_tp', 'qc_qty', 'qc_tp', 'qc_minus_qty' ], prefix: 'end_', relaId: 'pid' },
|
|
{ data: endStageData, fields: ['contract_qty', 'contract_tp', 'qc_qty', 'qc_tp', 'qc_minus_qty' ], prefix: 'end_', relaId: 'pid' },
|
|
]);
|
|
]);
|