中间计量，本期计量金额

app/public/js/measure_compare.js

@@ -138,8 +138,8 @@ function calculateStageLedgerData(datas) {
     for (const d of datas) {
         d.gather_qty = ZhCalc.add(d.contract_qty, d.qc_qty);
         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);
+        // 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) {

app/public/js/stage_im.js

@@ -25,7 +25,8 @@ const stageIm = (function () {
         stageId: 'id',
     };
     gsTreeSetting.updateFields = ['contract_qty', 'contract_tp', 'qc_qty', 'qc_tp', 'qc_minus_qty'];
-    gsTreeSetting.calcFields = ['deal_tp', 'total_price', 'contract_tp', 'qc_tp', 'gather_tp', 'end_contract_tp', 'end_qc_tp', 'end_gather_tp'];
+    gsTreeSetting.calcFields = ['deal_tp', 'total_price', 'contract_tp', 'qc_tp', 'gather_tp', 'contract_pc_tp', 'qc_pc_tp', 'pc_tp',
+        'end_contract_tp', 'end_qc_tp', 'end_gather_tp'];
     gsTreeSetting.calcFun = function (node) {
         if (node.children && node.children.length === 0) {
             node.pre_gather_qty = ZhCalc.add(node.pre_contract_qty, node.pre_qc_qty);
@@ -35,9 +36,9 @@ const stageIm = (function () {
             node.end_gather_qty = ZhCalc.add(node.pre_gather_qty, node.gather_qty);
         }
         node.pre_gather_tp = ZhCalc.add(node.pre_contract_tp, node.pre_qc_tp);
-        node.gather_tp = ZhCalc.add(node.contract_tp, node.qc_tp);
-        node.end_contract_tp = ZhCalc.add(node.pre_contract_tp, node.contract_tp);
-        node.end_qc_tp = ZhCalc.add(node.pre_qc_tp, node.qc_tp);
+        node.gather_tp = ZhCalc.sum([node.contract_tp, node.qc_tp, node.pc_tp]);
+        node.end_contract_tp = ZhCalc.sum([node.pre_contract_tp, node.contract_tp, node.contract_pc_tp]);
+        node.end_qc_tp = ZhCalc.sum([node.pre_qc_tp, node.qc_tp, node.qc_pc_tp]);
         node.end_gather_tp = ZhCalc.add(node.pre_gather_tp, node.gather_tp);
     };
     const gsTree = createNewPathTree('stage', gsTreeSetting);