报表相关

app/service/report.js

@@ -350,47 +350,47 @@ module.exports = app => {
                             runnableKey.push(filter);
                             break;
                         case 'mem_budget_info':
-                            runnableRst.push(params.budget_id ? budgetSource.budgetInfo(params.budget_id) : budgetSource.tenderBudgetInfo(params.tender_id));
+                            runnableRst.push(params.budget_id > 0 ? budgetSource.budgetInfo(params.budget_id) : budgetSource.tenderBudgetInfo(params.tender_id));
                             runnableKey.push(filter);
                             break;
                         case 'mem_budget_gu':
-                            runnableRst.push(params.budget_id ? budgetSource.budgetGu(params.budget_id) : budgetSource.tenderGu(params.tender_id));
+                            runnableRst.push(params.budget_id > 0 ? budgetSource.budgetGu(params.budget_id) : budgetSource.tenderGu(params.tender_id));
                             runnableKey.push(filter);
                             break;
                         case 'mem_budget_gai':
-                            runnableRst.push(params.budget_id ? budgetSource.budgetGai(params.budget_id) : budgetSource.tenderGai(params.tender_id));
+                            runnableRst.push(params.budget_id > 0 ? budgetSource.budgetGai(params.budget_id) : budgetSource.tenderGai(params.tender_id));
                             runnableKey.push(filter);
                             break;
                         case 'mem_budget_yu':
-                            runnableRst.push(params.budget_id ? budgetSource.budgetYu(params.budget_id) : budgetSource.tenderYu(params.tender_id));
+                            runnableRst.push(params.budget_id > 0 ? budgetSource.budgetYu(params.budget_id) : budgetSource.tenderYu(params.tender_id));
                             runnableKey.push(filter);
                             break;
                         case 'mem_budget_zb':
-                            runnableRst.push(params.budget_id ? budgetSource.budgetZb(params.budget_id) : budgetSource.tenderZb(params.tender_id));
+                            runnableRst.push(params.budget_id > 0 ? budgetSource.budgetZb(params.budget_id) : budgetSource.tenderZb(params.tender_id));
                             runnableKey.push(filter);
                             break;
                         case 'mem_budget_final':
-                            runnableRst.push(params.budget_id ? budgetSource.budgetFinal(params.budget_id) : budgetSource.tenderFinal(params.tender_id));
+                            runnableRst.push(params.budget_id > 0 ? budgetSource.budgetFinal(params.budget_id) : budgetSource.tenderFinal(params.tender_id));
                             runnableKey.push(filter);
                             break;
                         case 'mem_budget_gu_filter':
-                            runnableRst.push(params.budget_id ? budgetSource.budgetGu(params.budget_id, true) : budgetSource.tenderGu(params.tender_id, true));
+                            runnableRst.push(params.budget_id > 0 ? budgetSource.budgetGu(params.budget_id, true) : budgetSource.tenderGu(params.tender_id, true));
                             runnableKey.push(filter);
                             break;
                         case 'mem_budget_gai_filter':
-                            runnableRst.push(params.budget_id ? budgetSource.budgetGai(params.budget_id, true) : budgetSource.tenderGai(params.tender_id, true));
+                            runnableRst.push(params.budget_id > 0 ? budgetSource.budgetGai(params.budget_id, true) : budgetSource.tenderGai(params.tender_id, true));
                             runnableKey.push(filter);
                             break;
                         case 'mem_budget_yu_filter':
-                            runnableRst.push(params.budget_id ? budgetSource.budgetYu(params.budget_id, true) : budgetSource.tenderYu(params.tender_id, true));
+                            runnableRst.push(params.budget_id > 0 ? budgetSource.budgetYu(params.budget_id, true) : budgetSource.tenderYu(params.tender_id, true));
                             runnableKey.push(filter);
                             break;
                         case 'mem_budget_zb_filter':
-                            runnableRst.push(params.budget_id ? budgetSource.budgetZb(params.budget_id, true) : budgetSource.tenderZb(params.tender_id, true));
+                            runnableRst.push(params.budget_id > 0 ? budgetSource.budgetZb(params.budget_id, true) : budgetSource.tenderZb(params.tender_id, true));
                             runnableKey.push(filter);
                             break;
                         case 'mem_budget_final_filter':
-                            runnableRst.push(params.budget_id ? budgetSource.budgetFinal(params.budget_id, true) : budgetSource.tenderFinal(params.tender_id, true));
+                            runnableRst.push(params.budget_id > 0 ? budgetSource.budgetFinal(params.budget_id, true) : budgetSource.tenderFinal(params.tender_id, true));
                             runnableKey.push(filter);
                             break;
                         case 'mem_pm_deal_pay':

app/service/rpt_gather_memory.js

@@ -37,6 +37,8 @@ const gatherUtils = {
 
         gatherNode[prefix + "qty"] = helper.add(gatherNode[prefix + "qty"], sourceNode.quantity);
         gatherNode[prefix + "tp"] = helper.add(gatherNode[prefix + "tp"], sourceNode.total_price);
+        gatherNode[prefix + "deal_qty"] = helper.add(gatherNode[prefix + "deal_qty"], sourceNode.quantity);
+        gatherNode[prefix + "deal_tp"] = helper.add(gatherNode[prefix + "deal_tp"], sourceNode.total_price);
 
         gatherNode[prefix + "dgn_qty1"] = helper.add(gatherNode[prefix + "dgn_qty1"], sourceNode.dgn_qty1);
         gatherNode[prefix + "dgn_qty2"] = helper.add(gatherNode[prefix + "dgn_qty2"], sourceNode.dgn_qty2);
@@ -70,6 +72,8 @@ 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_deal_qty = helper.add(gatherNode.s_deal_qty, sourceNode.deal_qty);
+        gatherNode.s_deal_tp = helper.add(gatherNode.s_deal_tp, sourceNode.deal_tp);
 
         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);
@@ -108,6 +112,8 @@ const gatherUtils = {
 
         gatherNode[prefix + "qty"] = helper.add(gatherNode[prefix + "qty"], sourceNode.quantity);
         gatherNode[prefix + "tp"] = helper.add(gatherNode[prefix + "tp"], sourceNode.total_price);
+        gatherNode[prefix + "deal_qty"] = helper.add(gatherNode[prefix + "deal_qty"], sourceNode.quantity);
+        gatherNode[prefix + "deal_tp"] = helper.add(gatherNode[prefix + "deal_tp"], sourceNode.total_price);
 
         gatherNode[prefix + "dgn_qty1"] = helper.add(gatherNode[prefix + "dgn_qty1"], sourceNode.dgn_qty1);
         gatherNode[prefix + "dgn_qty2"] = helper.add(gatherNode[prefix + "dgn_qty2"], sourceNode.dgn_qty2);
@@ -127,6 +133,8 @@ 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_deal_qty = helper.add(gatherNode.s_deal_qty, sourceNode.deal_qty);
+        gatherNode.s_deal_tp = helper.add(gatherNode.s_deal_tp, sourceNode.deal_tp);
 
         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);
@@ -143,12 +151,16 @@ const gatherUtils = {
 
         gatherNode[prefix + "qty"] = helper.add(gatherNode[prefix + "qty"], sourceNode.quantity);
         gatherNode[prefix + "tp"] = helper.add(gatherNode[prefix + "tp"], sourceNode.total_price);
+        gatherNode[prefix + "deal_qty"] = helper.add(gatherNode[prefix + "deal_qty"], sourceNode.quantity);
+        gatherNode[prefix + "deal_tp"] = helper.add(gatherNode[prefix + "deal_tp"], sourceNode.total_price);
 
         gatherNode[prefix + "dgn_qty1"] = helper.add(gatherNode[prefix + "dgn_qty1"], sourceNode.dgn_qty1);
         gatherNode[prefix + "dgn_qty2"] = helper.add(gatherNode[prefix + "dgn_qty2"], sourceNode.dgn_qty2);
 
         gatherNode.s_qty = helper.add(gatherNode.s_qty, sourceNode.quantity);
         gatherNode.s_tp = helper.add(gatherNode.s_tp, sourceNode.total_price);
+        gatherNode.s_deal_qty = helper.add(gatherNode.s_deal_qty, sourceNode.deal_qty);
+        gatherNode.s_deal_tp = helper.add(gatherNode.s_deal_tp, sourceNode.deal_tp);
     },
     gatherSpecial: function (gatherNode, sourceNode, prefix, helper) {
         gatherNode[prefix + "qty"] = helper.add(gatherNode[prefix + "qty"], sourceNode.quantity);