交叉排序

app/lib/rpt_data_analysis.js

@@ -1016,8 +1016,8 @@ const gatherSelectConverse = {
         const reg = new RegExp('^t_[0-9]+_');
         for (let i = 0; i < count; i++) {
             const curReg = new RegExp('^t_' + i + '_');
-            for (const d of data) {
-                const nd = {};
+            for (const [i, d] of data.entries()) {
+                const nd = { cross_index: i + 1};
                 for (const prop in d) {
                     if (reg.test(prop)) {
                         if (curReg.test(prop)) {

builder_report_index_define.js

@@ -760,6 +760,8 @@ const gather_stage_bills = {
 
         { name: '(特殊3-需替换key3)台账-数量', field: 'ts_key3_qty', type: dataType.currency },
         { name: '(特殊3-需替换key3)台账-金额', field: 'ts_key3_tp', type: dataType.currency },
+
+        { name: '交叉排序', field: 'cross_index', type: dataType.int },
     ],
 };
 const gather_tender_info = {
@@ -817,6 +819,8 @@ const gather_stage_pay = {
         { name: '(合计)本期-金额', field: 's_tp', type: dataType.currency },
         { name: '(合计)截止上期-金额', field: 's_pre_tp', type: dataType.currency },
         { name: '(合计)截止本期-金额', field: 's_end_tp', type: dataType.currency },
+
+        { name: '交叉排序', field: 'cross_index', type: dataType.int },
     ],
 };
 const gather_deal_bills = {
@@ -841,6 +845,16 @@ const gather_deal_bills = {
         { name: '(特殊1)金额', field: 'ts_key1_tp', type: dataType.currency },
         { name: '(特殊2)金额', field: 'ts_key2_tp', type: dataType.currency },
         { name: '(特殊3)金额', field: 'ts_key3_tp', type: dataType.currency },
+
+        { name: '(标段)数量', field: 't_qty', type: dataType.currency },
+
+        { name: '(合计)数量', field: 's_qty', type: dataType.currency },
+
+        { name: '(特殊1)数量', field: 'ts_key1_qty', type: dataType.currency },
+        { name: '(特殊2)数量', field: 'ts_key2_qty', type: dataType.currency },
+        { name: '(特殊3)数量', field: 'ts_key3_qty', type: dataType.currency },
+
+        { name: '交叉排序', field: 'cross_index', type: dataType.int },
     ],
 };