多期比较，计算补差

app/controller/measure_controller.js

@@ -254,7 +254,7 @@ module.exports = app => {
                         data.bills = await ctx.service.stageBills.getLastestStageData2(ctx.tender.id, stage.id);
                         const bpcData = await ctx.service.stageBillsPc.getAllDataByCondition({ where: { sid: stage.id } });
                         this.joinData(data.bills, 'lid', [
-                            { data: bpcData, fields: ['pc_tp'], prefix: '', relaId: 'lid' },
+                            { data: bpcData, fields: ['contract_pc_tp', 'qc_pc_tp', 'pc_tp'], prefix: '', relaId: 'lid' },
                         ]);
                         data.pos = await ctx.service.stagePos.getLastestStageData2(ctx.tender.id, stage.id);
                         result.stages.push(data);

app/public/js/measure_compare.js

@@ -137,7 +137,9 @@ function initSpreadSettingWithRoles(compareRoles) {
 function calculateStageLedgerData(datas) {
     for (const d of datas) {
         d.gather_qty = ZhCalc.add(d.contract_qty, d.qc_qty);
-        d.gather_tp = ZhCalc.add(d.contract_tp, d.qc_tp);
+        d.gather_tp = ZhCalc.sum([d.contract_tp, d.qc_tp, d.pc_tp]);
+        d.pc_tp = ZhCalc.add(d.qc_tp, d.qc_pc_tp);
+        d.contract_tp = ZhCalc.add(d.contract_tp, d.contract_pc_tp);
     }
 }
 function calculateStagePosData(datas) {