reportType的判断

web/building_saas/report/js/rpt_main.js

@@ -244,7 +244,7 @@ let zTreeOprObj = {
         let me = zTreeOprObj;
         if (treeNode.nodeType === TPL_TYPE_TEMPLATE && treeNode.refId > 0) {
             me.currentNode = treeNode;
-            if (treeNode.hasOwnProperty('flags') && treeNode.flags.hasOwnProperty('reportType') && treeNode['flags']['reportType'] !== 'NA') {
+            if (treeNode.hasOwnProperty('flags') && treeNode.flags.hasOwnProperty('reportType') && treeNode['flags']['reportType'] !== 'NA' && treeNode['flags']['reportType'] !== null) {
                 if (treeNode['flags']['reportType'] === 'billSummary') {
                     me.requestPrjFolderForBillsSummary();
                 } else if (treeNode['flags']['reportType'] === 'gljSummary') {
@@ -283,7 +283,7 @@ let zTreeOprObj = {
         let me = zTreeOprObj;
 
         if (me.currentNode) {
-            if (me.currentNode.hasOwnProperty('flags') && me.currentNode.flags.hasOwnProperty('reportType') && me.currentNode['flags']['reportType'] !== 'NA') {
+            if (me.currentNode.hasOwnProperty('flags') && me.currentNode.flags.hasOwnProperty('reportType') && me.currentNode['flags']['reportType'] !== 'NA' && me.currentNode['flags']['reportType'] !== null) {
                 let refRptTplIds = [], refBillSumPrjsIds = [], refGljSumPrjsIds = [];
                 if (me.currentNode['flags']['reportType'] === 'billSummary') {
                     refBillSumPrjsIds.push(me.currentNode.refId);
@@ -745,7 +745,7 @@ let rptControlObj = {
     },
     getTplIdsCommon: function (refRptTplIds, refBillSumPrjsIds, refGljSumPrjsIds, rpt_names, bill_rpt_names, glj_rpt_names) {
         for (let node of zTreeOprObj.checkedRptTplNodes) {
-            if (node.hasOwnProperty('flags') && node.flags.hasOwnProperty('reportType') && node['flags']['reportType'] !== 'NA') {
+            if (node.hasOwnProperty('flags') && node.flags.hasOwnProperty('reportType') && node['flags']['reportType'] !== 'NA' && node['flags']['reportType'] !== null) {
                 if (node['flags']['reportType'] === 'billSummary') {
                     refBillSumPrjsIds.push(node.refId);
                     if (bill_rpt_names) bill_rpt_names.push(node.name);