Bladeren bron

修复独立期显示金额bug

laiguoran 2 jaren geleden
bovenliggende
commit
c66daf2113
2 gewijzigde bestanden met toevoegingen van 9 en 3 verwijderingen
  1. 7 1
      app/controller/material_controller.js
  2. 2 2
      app/public/js/material_list.js

+ 7 - 1
app/controller/material_controller.js

@@ -506,7 +506,13 @@ module.exports = app => {
                 responseData.data.pos = await ctx.service.pos.getPosData({ tid: ctx.tender.id });
                 // 获取所选期数据并合并相加同类清单项
                 if (ctx.material.is_stage_self && data.sid) {
-                    responseData.data.curLedgerData = await ctx.service.stageBills.getStagesData(ctx.tender.id, data.sid.toString());
+                    const curLedgerPcData = await ctx.service.stageBillsPc.getStagesData(ctx.tender.id, data.sid.toString());
+                    const curLedgerData = await ctx.service.stageBills.getStagesData(ctx.tender.id, data.sid.toString());
+                    for (const cl of curLedgerData) {
+                        const clpc = ctx.helper._.find(curLedgerPcData, { lid: cl.lid });
+                        ctx.helper._.assign(cl, clpc);
+                    }
+                    responseData.data.curLedgerData = curLedgerData;
                     responseData.data.curPosData = await ctx.service.stagePos.getStagesData(ctx.tender.id, data.sid.toString(), 'list');
                     const ledgerListData = [];
                     const posListData = [];

+ 2 - 2
app/public/js/material_list.js

@@ -280,8 +280,8 @@ $(document).ready(() => {
                     gclGatherListData = newGclGatherListData;
                 }
                 // 解析清单汇总数据
-                gclGatherModel.loadLedgerData(ledger, curLedgerData);
-                gclGatherModel.loadPosData(pos, curPosData);
+                gclGatherModel.loadLedgerData(_.cloneDeep(ledger), curLedgerData);
+                gclGatherModel.loadPosData(_.cloneDeep(pos), curPosData);
                 gclGatherData = gclGatherModel.gatherGclData();
                 console.log(gclGatherData);