新增指标

app/public/js/stage.js

@@ -657,9 +657,9 @@ $(document).ready(() => {
         }
     };
     const ratioCol = ledgerSpreadSetting.cols.find(x => {return x.field === 'end_gather_percent' || x.field === 'end_correct_percent'});
-    ratioCol.field = tenderInfo.display.stage.correct ? 'end_correct_percent' : 'end_gather_percent';
+    if (ratioCol) ratioCol.field = tenderInfo.display.stage.correct ? 'end_correct_percent' : 'end_gather_percent';
     const ratioCol1 = ledgerSpreadSetting.cols.find(x => {return x.field === 'end_gather_1_percent' || x.field === 'end_correct_1_percent'});
-    ratioCol1.field = tenderInfo.display.stage.correct ? 'end_correct_1_percent' : 'end_gather_1_percent';
+    if (ratioCol) ratioCol1.field = tenderInfo.display.stage.correct ? 'end_correct_1_percent' : 'end_gather_1_percent';
     ledgerSpreadSetting.imageClick = function (data, hitinfo) {
         const col = hitinfo.sheet.zh_setting.cols[hitinfo.col];
         switch (col.field) {

builder_report_index_define.js

@@ -709,6 +709,13 @@ const stage_bills = {
         { name: '备注1', field: 'ex_memo1', type: dataType.str },
         { name: '备注2', field: 'ex_memo2', type: dataType.str },
         { name: '备注3', field: 'ex_memo3', type: dataType.str },
+
+        { name: '本期负变更', field: 'minus_qc_qty', type: dataType.double },
+        { name: '截止上期负变更', field: 'pre_minus_qc_qty', type: dataType.double },
+        { name: '截止本期负变更', field: 'pre_minus_qc_qty', type: dataType.double },
+        { name: '1#台账(台账+截止本期负变更)-数量', field: 'final_1_qty', type: dataType.double },
+        { name: '1#台账(台账+截止本期负变更)-金额', field: 'final_1_tp', type: dataType.double },
+        { name: '1#完成率(%)', field: 'final_1_ratio', type: dataType.double },
     ],
 };
 const stage_bills_compare = {
@@ -883,6 +890,12 @@ const stage_pos = {
         { name: '备注3', field: 'ex_memo3', type: dataType.str },
 
         { name: '现场实际数量', field: 'real_qty', type: dataType.currency },
+
+        { name: '本期负变更', field: 'minus_qc_qty', type: dataType.double },
+        { name: '截止上期负变更', field: 'pre_minus_qc_qty', type: dataType.double },
+        { name: '截止本期负变更', field: 'pre_minus_qc_qty', type: dataType.double },
+        { name: '1#台账(台账+截止本期负变更)-数量', field: 'final_1_qty', type: dataType.double },
+        { name: '1#完成率(%)', field: 'final_1_ratio', type: dataType.double },
     ],
 };
 const stage_pos_compare = {