|
|
@@ -135,7 +135,7 @@ class jhHelper {
|
|
|
let gather = false;
|
|
|
if (p.pre_cd && p.pre_cd.length > 0) gather = true;
|
|
|
for (const prefix of prefixes) {
|
|
|
- if (p[prefix + '_cd'] && p[prefix + '_cd'].length > 0) gather = true;
|
|
|
+ if (p[prefix + 'cd'] && p[prefix + 'cd'].length > 0) gather = true;
|
|
|
}
|
|
|
if (gather) {
|
|
|
rst.qc_qty = this.ctx.helper.add(rst.qc_qty, p.qc_qty);
|
|
|
@@ -153,6 +153,7 @@ class jhHelper {
|
|
|
rst[prefix + 'qc_tp'] = this.ctx.helper.mul(rst.unit_price, rst[prefix + 'qc_qty'], 2);
|
|
|
}
|
|
|
} else {
|
|
|
+ if (bills.b_code === '203-1-a') console.log(bills);
|
|
|
rst.qc_qty = bills.qc_qty;
|
|
|
rst.qc_tp = bills.qc_tp;
|
|
|
rst.pre_qc_qty = bills.pre_qc_qty;
|
|
|
@@ -173,7 +174,7 @@ class jhHelper {
|
|
|
let load = false;
|
|
|
if (p.pre_cd && p.pre_cd.length > 0) load = true;
|
|
|
for (const prefix of prefixes) {
|
|
|
- if (p[prefix + '_cd'] && p[prefix + '_cd'].length > 0) load = true;
|
|
|
+ if (p[prefix + 'cd'] && p[prefix + 'cd'].length > 0) load = true;
|
|
|
}
|
|
|
if (!load) continue;
|
|
|
|
|
|
@@ -241,7 +242,7 @@ class jhHelper {
|
|
|
];
|
|
|
for (const dc of gsDefine.defaultCompare) {
|
|
|
const auditor = auditors[dc];
|
|
|
- const auditorStage = await this.ctx.service.stagePos.getAuditorStageData2(tender.id, stage.id, auditor.times, auditor.order);
|
|
|
+ const auditorStage = await this.ctx.service.stageBills.getAuditorStageData(tender.id, stage.id, auditor.times, auditor.order);
|
|
|
loadData.push({ data: auditorStage, fields: ['qc_qty', 'qc_tp'], prefix: `r${dc}_`, relaId: 'pid' });
|
|
|
}
|
|
|
helper.assignRelaData(billsData, loadData);
|
|
|
@@ -365,6 +366,7 @@ class jhHelper {
|
|
|
const helper = this.ctx.helper;
|
|
|
// 排序
|
|
|
this.result.sort((x, y) => { return helper.compareCode(x.b_code, y.b_code); });
|
|
|
+ // console.log(this.result);
|
|
|
return this.result;
|
|
|
}
|
|
|
|
