汇总对比，其他台账，汇总虚拟月报错

app/controller/spss_controller.js

@@ -390,12 +390,13 @@ module.exports = app => {
             });
             if (!stage) return [bills, pos];
 
-            const preStage = stage.preCheckedStage ? await this.ctx.service.stageBillsFinal.getFinalData(tender, stage.order) : [];
+            const preStage = await this.ctx.service.stageBillsFinal.getFinalData(tender, stage.order);
             this.ctx.helper.assignRelaData(bills, [
                 { data: preStage, fields: ['contract_qty', 'contract_tp', 'qc_qty', 'qc_tp'], prefix: 'pre_', relaId: 'lid' },
             ]);
 
-            const preStagePos = stage.preCheckedStage ? await this.ctx.service.stagePosFinal.getFinalData(tender, stage.preCheckedStage.order) : [];
+            const preStagePos = await this.ctx.service.stagePosFinal.getFinalData(tender, stage.order);
+            console.log(stage.in_time, preStage.length, preStagePos.length);
             this.ctx.helper.assignRelaData(pos, [
                 { data: preStagePos, fields: ['contract_qty', 'qc_qty'], prefix: 'pre_', relaId: 'pid' },
             ]);
@@ -713,9 +714,9 @@ module.exports = app => {
 
             const data = await this.ctx.service.stageOther.getStageData(stage);
             for (const d of data) {
-                d.pre_tp = pd.tp;
-                d.end_tp = pd.tp;
-                pd.tp = 0;
+                d.pre_tp = d.tp;
+                d.end_tp = d.tp;
+                d.tp = 0;
             }
             return data;
         }

app/public/js/spss_gather_stage.js

@@ -230,14 +230,14 @@ $(document).ready(() => {
 
                 treeSetting.calcFields = ['sum_total_price', 'sum_contract_tp', 'sum_qc_tp', 'sum_gather_tp', 'sum_end_contract_tp', 'sum_end_qc_tp', 'sum_end_gather_tp'];
                 for (let i = 1; i <= result.length; i++) {
-                    treeSetting.calcFields.push('total_price_' + i, 'contract_tp_' + i, 'qc_tp_' + i, 'gather_tp_' + i, 'end_contract_tp_' + i, 'end_qc_tp_' + i, 'end_gather_tp_' + i);
+                    treeSetting.calcFields.push('total_price_' + i, 'contract_tp_' + i, 'qc_tp_' + i, 'gather_tp_' + i, 'end_contract_tp_' + i, 'end_qc_tp_' + i, 'end_gather_tp_' + i, 'pre_contract_tp_' + i, 'pre_qc_tp_' + i, 'pre_gather_tp_' + i);
                 }
 
                 const tenderTreeSetting = {
                     id: 'ledger_id', pid: 'ledger_pid', order: 'order', level: 'level',
                     rootId: -1,
                     keys: ['id', 'tender_id', 'ledger_id'],
-                    calcFields: ['total_price', 'contract_tp', 'qc_tp', 'gather_tp', 'end_contract_tp', 'end_qc_tp', 'end_gather_tp'],
+                    calcFields: ['total_price', 'contract_tp', 'qc_tp', 'gather_tp', 'pre_contract_tp', 'pre_qc_tp', 'pre_gather_tp', 'end_contract_tp', 'end_qc_tp', 'end_gather_tp'],
                     calcFun: function(node) {
                         if (!node.children || node.children.length === 0) {
                             node.pre_gather_qty = ZhCalc.add(node.pre_contract_qty, node.pre_qc_qty);