报表内存表，期汇总，添加设计数量字段

app/service/rpt_gather_memory.js

@@ -67,6 +67,9 @@ const gatherUtils = {
         gatherNode['s_' + "qty"] = helper.add(gatherNode['s_' + "qty"], sourceNode.quantity);
         gatherNode['s_' + "tp"] = helper.add(gatherNode['s_' + "tp"], sourceNode.total_price);
 
+        gatherNode['s_' + "dgn_qty1"] = helper.add(gatherNode['s_' + "dgn_qty1"], sourceNode.dgn_qty1);
+        gatherNode['s_' + "dgn_qty2"] = helper.add(gatherNode['s_' + "dgn_qty2"], sourceNode.dgn_qty2);
+
         gatherNode['s_' + "contract_qty"] = helper.add(gatherNode['s_' + "contract_qty"], sourceNode.contract_qty);
         gatherNode['s_' + "contract_tp"] = helper.add(gatherNode['s_' + "contract_tp"], sourceNode.contract_tp);
         gatherNode['s_' + "qc_qty"] = helper.add(gatherNode['s_' + "qc_qty"], sourceNode.qc_qty);
@@ -87,6 +90,11 @@ const gatherUtils = {
         gatherNode['s_' + "end_qc_tp"] = helper.add(gatherNode['s_' + "end_qc_tp"], sourceNode.end_qc_tp);
         gatherNode['s_' + "end_gather_qty"] = helper.add(gatherNode['s_' + "end_gather_qty"], sourceNode.end_gather_qty);
         gatherNode['s_' + "end_gather_tp"] = helper.add(gatherNode['s_' + "end_gather_tp"], sourceNode.end_gather_tp);
+
+        gatherNode['s_' + "deal_dgn_qty1"] = helper.add(gatherNode['s_' + "deal_dgn_qty1"], sourceNode.deal_dgn_qty1);
+        gatherNode['s_' + "deal_dgn_qty2"] = helper.add(gatherNode['s_' + "deal_dgn_qty2"], sourceNode.deal_dgn_qty2);
+        gatherNode['s_' + "c_dgn_qty1"] = helper.add(gatherNode['s_' + "c_dgn_qty1"], sourceNode.c_dgn_qty1);
+        gatherNode['s_' + "c_dgn_qty2"] = helper.add(gatherNode['s_' + "c_dgn_qty2"], sourceNode.c_dgn_qty2);
     },
     gatherZone: function (tender, gatherNode, sourceNode, prefix, helper) {
         gatherNode[prefix + 'id'] = tender.id;

builder_report_index_define.js

@@ -836,6 +836,13 @@ const gather_stage_bills = {
         { name: '(标段)变更-设计数量2', field: 't_c_dgn_qty2', type: dataType.currency },
 
         { name: '树结构-是否子项', field: 'is_leaf', type: dataType.int },
+
+        { name: '(合计)台账-设计数量1', field: 's_dgn_qty1', type: dataType.currency },
+        { name: '(合计)台账-设计数量2', field: 's_dgn_qty2', type: dataType.currency },
+        { name: '(合计)合同-设计数量1', field: 's_deal_dgn_qty1', type: dataType.currency },
+        { name: '(合计)合同-设计数量2', field: 's_deal_dgn_qty2', type: dataType.currency },
+        { name: '(合计)变更-设计数量1', field: 's_c_dgn_qty1', type: dataType.currency },
+        { name: '(合计)变更-设计数量2', field: 's_c_dgn_qty2', type: dataType.currency },
     ],
 };
 const gather_tender_info = {