|
@@ -921,7 +921,7 @@ module.exports = app => {
|
|
|
await this.layout('revise/compare.ejs', renderData, 'revise/compare_modal.ejs');
|
|
|
}
|
|
|
|
|
|
- _loadPreData(curData, preData, field, prefix, relaId) {
|
|
|
+ _loadPreData(curData, preData, field, prefix, relaId, extraFields = []) {
|
|
|
if (preData.length === 0) return;
|
|
|
for (const pd of preData) {
|
|
|
const cd = curData.find(x => {return x[relaId] === pd[relaId]});
|
|
@@ -932,6 +932,9 @@ module.exports = app => {
|
|
|
} else {
|
|
|
const ncd = {id: pd.id};
|
|
|
ncd[relaId] = pd[relaId];
|
|
|
+ for (const ef of extraFields) {
|
|
|
+ ncd[ef] = pd[ef];
|
|
|
+ }
|
|
|
for (const f of field) {
|
|
|
ncd[prefix + f] = pd[f];
|
|
|
}
|
|
@@ -966,7 +969,7 @@ module.exports = app => {
|
|
|
const preStageData = ctx.lastStage.order > 1
|
|
|
? await ctx.service.stagePosFinal.getFinalData(ctx.tender.data, ctx.lastStage.order - 1)
|
|
|
: [];
|
|
|
- this._loadPreData(curStageData, preStageData, ['contract_qty', 'qc_qty'], 'pre_', 'pid');
|
|
|
+ this._loadPreData(curStageData, preStageData, ['contract_qty', 'qc_qty'], 'pre_', 'pid', ['lid']);
|
|
|
return curStageData;
|
|
|
}
|
|
|
|