code sync

modules/reports/rpt_component/jpc_bill_tab.js

@@ -114,7 +114,7 @@ JpcBillTabSrv.prototype.createNew = function(){
                 for (let i = 0; i < tab_fields.length; i++) {
                     let tab_field = tab_fields[i];
                     let data_field = null, map_data_field = JE.F(tab_field[JV.PROP_FIELD_ID], $CURRENT_RPT);
-                    if (me.disp_fields_idx.length > i && me.disp_fields_idx[i] !== JV.BLANK_FIELD_INDEX) {
+                    if (me.disp_fields_idx.length > i && me.disp_fields_idx[i] !== JV.BLANK_FIELD_INDEX && (typeof me.disp_fields_idx[i] !== 'object')) {
                         data_field = data_details[me.disp_fields_idx[i]];
                     } else {
                         if (map_data_field) {

web/maintain/report/js/rpt_tpl_data_map.js

@@ -465,8 +465,10 @@ let dataInfoMapTreeOprObj = {
     onBeforeRemove: function(treeId, treeNode){
         let rst = true;
         if (treeNode.isParent) {
-            if (!(treeNode.Name === `子项` && treeNode.getParentNode() !== null && treeNode.getParentNode().Name === `离散信息` && confirm(`确认要删除此离散子项？`))) {
-                rst = false;
+            if (treeNode.Name === `子项` && treeNode.getParentNode() !== null && treeNode.getParentNode().Name === `离散信息`) {
+                rst = confirm(`确认要删除此离散子项？`);
+            } else if (treeNode.Name === `行`) {
+                rst = confirm(`确认要删除此分组行？`);
             }
         } else {
             //