调差清单本期金额添加补差值

app/controller/material_controller.js

@@ -511,13 +511,25 @@ module.exports = app => {
                     const ledgerListData = [];
                     const posListData = [];
                     for (const s of ctx.material.stage_id.split(',')) {
-                        ledgerListData.push(await ctx.service.stageBills.getStagesData(ctx.tender.id, s.toString()));
+                        const curLedgerPcData = await ctx.service.stageBillsPc.getStagesData(ctx.tender.id, s.toString());
+                        const curLedgerData = await ctx.service.stageBills.getStagesData(ctx.tender.id, s.toString());
+                        for (const cl of curLedgerData) {
+                            const clpc = ctx.helper._.find(curLedgerPcData, { lid: cl.lid });
+                            ctx.helper._.assign(cl, clpc);
+                        }
+                        ledgerListData.push(curLedgerData);
                         posListData.push(await ctx.service.stagePos.getStagesData(ctx.tender.id, s.toString(), 'list'));
                     }
                     responseData.data.ledgerListData = ledgerListData;
                     responseData.data.posListData = posListData;
                 } else {
-                    responseData.data.curLedgerData = await ctx.service.stageBills.getStagesData(ctx.tender.id, ctx.material.stage_id);
+                    const curLedgerPcData = await ctx.service.stageBillsPc.getStagesData(ctx.tender.id, ctx.material.stage_id);
+                    const curLedgerData = await ctx.service.stageBills.getStagesData(ctx.tender.id, ctx.material.stage_id);
+                    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, ctx.material.stage_id, 'list');
                 }
                 // 获取清单设置已选清单

app/public/js/gcl_gather.js

@@ -28,7 +28,7 @@ const gclGatherModel = (function () {
         keys: ['id', 'tender_id', 'ledger_id'],
         stageId: 'id',
     };
-    gsTreeSetting.updateFields = ['contract_qty', 'contract_tp', 'qc_qty', 'qc_tp', 'qc_minus_qty'];
+    gsTreeSetting.updateFields = ['contract_qty', 'contract_tp', 'qc_qty', 'qc_tp', 'contract_pc_tp', 'qc_pc_tp', 'pc_tp', 'qc_minus_qty'];
     const gsTree = createNewPathTree('stage', gsTreeSetting);
     // 初始化 部位明细
     const posSetting = {