|
@@ -243,7 +243,6 @@ class ReportMemoryMaterial {
|
|
|
const material = await this.ctx.service.material.getDataByCondition({ tid: tender_id, order: material_order });
|
|
|
const decimal = material.decimal ? JSON.parse(material.decimal) : materialConst.decimal;
|
|
|
try {
|
|
|
-
|
|
|
const billsData = await this.ctx.service.ledger.getData(tender_id);
|
|
|
const curStageBills = await this.ctx.service.stageBills.getStagesData(tender_id, material.stage_id);
|
|
|
this.ctx.helper.assignRelaData(billsData, [
|
|
@@ -278,6 +277,7 @@ class ReportMemoryMaterial {
|
|
|
const mnj = materialNotJoin.find(m => {
|
|
|
return m.gcl_id === x.org_gcl_id && m.xmj_id === x.id && (x.mx_id && x.mx_id !== x.id ? x.mx_id === m.mx_id : true);
|
|
|
});
|
|
|
+ x.is_join = !mnj;
|
|
|
if (mnj) continue;
|
|
|
const list = materialGl.filter(g => {
|
|
|
return g.gcl_id === x.org_gcl_id && g.xmj_id === x.id && (x.mx_id && x.mx_id !== x.id ? x.mx_id === g.mx_id : true);
|