Przeglądaj źródła

主从交叉,base相关

MaiXinRong 2 lat temu
rodzic
commit
dc92957c28
1 zmienionych plików z 3 dodań i 1 usunięć
  1. 3 1
      app/lib/rpt_data_analysis.js

+ 3 - 1
app/lib/rpt_data_analysis.js

@@ -1917,7 +1917,8 @@ const masterCross = {
             quoteFields: ['quantity'],
             gatherFields: [],
         },
-        target: 'master_converse'
+        target: 'master_converse',
+        base: 'main',
     },
     _converse: function(ctx, options, mainTable, subTable) {
         const data = [];
@@ -1939,6 +1940,7 @@ const masterCross = {
                 temp[options.main.prefix + f] = m[f];
             }
             const rela = subTable.filter(x => { return x[options.sub.subKey] === m[options.sub.masterKey]; });
+            if (options.base === 'sub' && rela.length === 0) continue;
             for (const cd of converseData) {
                 const nd = JSON.parse(JSON.stringify(temp));
                 nd.quote = false;