|
@@ -936,10 +936,12 @@ module.exports = app => {
|
|
|
try {
|
|
|
// 判断是否台账修订中,修订中则不获取changeLedger及changePos值
|
|
|
const lastRevise = await ctx.service.ledgerRevise.getLastestRevise(ctx.tender.id);
|
|
|
+ const data = JSON.parse(ctx.request.body.data);
|
|
|
+ const from = data.from ? data.from : '';
|
|
|
const ledgerData = await ctx.service.ledger.getData(ctx.tender.id);
|
|
|
- const changeLedgerData = lastRevise && lastRevise.status !== audit.revise.status.checked ? [] : await ctx.service.changeLedger.getData(ctx.tender.id);
|
|
|
+ const changeLedgerData = lastRevise && lastRevise.status !== audit.revise.status.checked && data.from !== 'revise' ? [] : await ctx.service.changeLedger.getData(ctx.tender.id);
|
|
|
const posData = await ctx.service.pos.getPosData({ tid: ctx.tender.id });
|
|
|
- const changePosData = lastRevise && lastRevise.status !== audit.revise.status.checked ? [] : await ctx.service.changePos.getPosData({ tid: ctx.tender.id });
|
|
|
+ const changePosData = lastRevise && lastRevise.status !== audit.revise.status.checked && data.from !== 'revise' ? [] : await ctx.service.changePos.getPosData({ tid: ctx.tender.id });
|
|
|
const dealBills = await ctx.service.dealBills.getAllDataByCondition({ where: { tender_id: ctx.tender.id } });
|
|
|
ctx.body = { err: 0, msg: '', data: { bills: ctx.helper._.concat(ledgerData, changeLedgerData), pos: ctx.helper._.concat(posData, changePosData), dealBills } };
|
|
|
} catch (err) {
|