|
@@ -372,7 +372,11 @@ module.exports = app => {
|
|
for (const [mindex, mb] of renderData.materialBillsData.entries()) {
|
|
for (const [mindex, mb] of renderData.materialBillsData.entries()) {
|
|
const result = await ctx.service.materialBillsHistory.getByMbId(ctx.material.id, ctx.material.order, mb.id);
|
|
const result = await ctx.service.materialBillsHistory.getByMbId(ctx.material.id, ctx.material.order, mb.id);
|
|
_.forEach(result, function(value, key) {
|
|
_.forEach(result, function(value, key) {
|
|
- renderData.materialBillsData[mindex][key] = result ? result[key] : null;
|
|
|
|
|
|
+ if (key === 'mb_id') {
|
|
|
|
+ renderData.materialBillsData[mindex].id = result ? result[key] : null;
|
|
|
|
+ } else {
|
|
|
|
+ renderData.materialBillsData[mindex][key] = result ? result[key] : null;
|
|
|
|
+ }
|
|
});
|
|
});
|
|
}
|
|
}
|
|
}
|
|
}
|