台账修订，清单对比页面问题

app/lib/rpt_data_analysis.js

@@ -618,6 +618,8 @@ const gatherChapter = {
             defaultFilter = [];
         for (const d of sourceData) {
             if (this._checkMatch(this.defaultSetting.filter, d)) defaultFilter.push(d.full_path);
+            if (this._checkFilter(d.full_path, filter)) continue;
+
             for (const c of customChapter) {
                 if (c.match && this._checkMatch(c.match, d)) {
                     gatherData(c, d);
@@ -625,7 +627,7 @@ const gatherChapter = {
                 }
             }
 
-            if (!d.is_leaf || this._checkFilter(d.full_path, filter)) continue;
+            if (!d.is_leaf) continue;
 
             for (const c of otherChapter) {
                 if (c.cType === 41) {
@@ -660,6 +662,7 @@ const gatherChapter = {
             return (x.visible !== undefined && x.visible !== null) ? x.visible : true;
 
         });
+        console.log(data[fieldsKey[0].table])
     },
 };
 const join = {

app/public/js/shares/gcl_gather_compare.js

@@ -284,6 +284,7 @@ const gclCompareModel = (function () {
 
         otherChapter.qd = { name: '清单小计(A)', cType: 11, serialNo: serialNo+2 };
         otherChapter.fqd = { name: '非清单项费用(B)', cType: 31, serialNo: serialNo+3 };
+        return[gclChapter, otherChapter, gclChapterFilter];
     }
 
     function _gatherChapterFields(chapter, data, fields) {