报表，安全生产费，全参与人数据问题

app/lib/rm/payment_safe.js

@@ -70,15 +70,15 @@ class rptMemPaymentSafe extends RptMemBase {
             d.cur_his.sort((x, y) => { return x.times === y.times ? x.order - y.order : x.times - y.times; });
             for (const r of roles) {
                 if (r.latest) {
-                    d[`qty_${r.order}`] = d.cur_qty;
-                    d[`tp_${r.order}`] = d.cur_tp;
+                    d[`r_qty_${r.order}`] = d.cur_qty;
+                    d[`r_tp_${r.order}`] = d.cur_tp;
                     d.his_qty.push(d.cur_qty);
                     d.his_tp.push(d.cur_tp);
                 } else {
                     const rHis = findHis(r, d.cur_his);
                     if (rHis) {
-                        d[`qty_${r.order}`] = rHis.qty;
-                        d[`tp_${r.order}`] = rHis.tp;
+                        d[`r_qty_${r.order}`] = rHis.qty;
+                        d[`r_tp_${r.order}`] = rHis.tp;
                     }
                     d.his_qty.push(rHis ? rHis.qty : 0);
                     d.his_tp.push(rHis ? rHis.tp : 0);
@@ -99,7 +99,7 @@ class rptMemPaymentSafe extends RptMemBase {
             fullPath: 'tree_full_path',
             rootId: -1,
         };
-        setting.calcFields = roles.map(x => { return `tp_${x.order}`});
+        setting.calcFields = roles.map(x => { return `r_tp_${x.order}`});
         setting.calcFields.push('pre_tp');
         const compareTree = new Ledger.billsTree(this.ctx, setting);
         compareTree.loadDatas(bills);