概算控制，造价对比，决算设计数量

app/controller/budget_controller.js

@@ -184,12 +184,14 @@ module.exports = app => {
                     //     { data: finalBills, fields: ['contract_tp', 'qc_tp', 'used'], prefix: 'end_', relaId: 'lid' },
                     // ]);
 
+                    const dgnData = await ctx.service.stageBillsDgn.getDgnData(id);
                     // 使用最新一期对比
                     const stage = await ctx.service.stage.getLastestStage(id);
                     if (stage.status === auditConst.stage.status.checked) {
                         const finalBills = await ctx.service.stageBillsFinal.getFinalData({id}, stage.order);
                         ctx.helper.assignRelaData(bills, [
                             { data: finalBills, fields: ['contract_tp', 'qc_tp'], prefix: 'end_', relaId: 'lid' },
+                            { data: dgnData, fields: ['deal_dgn_qty1', 'deal_dgn_qty2', 'c_dgn_qty1', 'c_dgn_qty2'], prefix: '', relaId: 'id' },
                         ]);
                         bills.forEach(b => {
                             b.end_gather_tp = helper.add(b.end_qc_tp, b.end_contract_tp);
@@ -205,6 +207,7 @@ module.exports = app => {
                         ctx.helper.assignRelaData(bills, [
                             { data: curBills, fields: ['contract_tp', 'qc_tp'], prefix: '', relaId: 'lid' },
                             { data: preBills, fields: ['contract_tp', 'qc_tp'], prefix: 'pre_', relaId: 'lid' },
+                            { data: dgnData, fields: ['deal_dgn_qty1', 'deal_dgn_qty2', 'c_dgn_qty1', 'c_dgn_qty2'], prefix: '', relaId: 'id' },
                         ]);
                         bills.forEach(b => {
                             b.end_gather_tp = helper.sum([b.qc_tp, b.contract_tp, b.pre_qc_tp, b.pre_contract_tp]);

app/public/js/budget_compare.js

@@ -190,8 +190,8 @@ $(document).ready(() => {
                     cur.total_price = ZhCalc.add(cur.total_price, source.total_price);
                     cur.dgn_qty1 = ZhCalc.add(cur.dgn_qty1, source.dgn_qty1);
                     cur.dgn_qty2 = ZhCalc.add(cur.dgn_qty2, source.dgn_qty2);
-                    cur.final_dgn_qty1 = ZhCalc.add(cur.final_dgn_qty1, source.end_dgn_qty1);
-                    cur.final_dgn_qty2 = ZhCalc.add(cur.final_dgn_qty2, source.end_dgn_qty2);
+                    cur.final_dgn_qty1 = ZhCalc.sum([cur.final_dgn_qty1, source.deal_dgn_qty1, source.c_dgn_qty1]);
+                    cur.final_dgn_qty2 = ZhCalc.sum([cur.final_dgn_qty2, source.deal_dgn_qty2, source.c_dgn_qty2]);
                     cur.final_tp = ZhCalc.add(cur.final_tp, source.end_gather_tp);
                 });
             }