2 İşlemeler 1456030719 ... f42cdd82bb

Yazar SHA1 Mesaj Tarih
  Tony Kang f42cdd82bb Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev 2 ay önce
  Tony Kang 6b5a2348b6 BUG #3769 2 ay önce
1 değiştirilmiş dosya ile 32 ekleme ve 31 silme
  1. 32 31
      app/public/report/js/rpt_main.js

+ 32 - 31
app/public/report/js/rpt_main.js

@@ -104,38 +104,39 @@ let zTreeOprObj = {
         const _chkIfShouldFilter = function(rptItem, currentRptType = 'normal') {
             let rst = (!(rptItem.released) && rptItem.nodeType === 2 || rptItem.hidden); //未发布判断 或 故意隐藏
             if (!rst) {
+                // !!!因判断逻辑调整,所有报表类型的判断是在目录级别,不单独判断报表了
                 // 根据当前业务类型判断及检测其他非同类报表,如动态决算类型、支付审批类型
-                switch(currentRptType) {
-                    case 'normal':
-                        if (rptItem.flags) {
-                            if (rptItem.flags.dynamicType || rptItem.flags.payAuditType) {
-                                if (rptItem.flags.dynamicType && rptItem.flags.dynamicType !== 'N/A') {
-                                    rst = true;
-                                    break;
-                                }
-                                if (rptItem.flags.payAuditType && rptItem.flags.payAuditType !== 'N/A') {
-                                    rst = true;
-                                    break;
-                                }
-                            }
-                        }
-                        // 检测:预付款
-                        if (CURRENT_SELECTED_BIZ_TYPE === 'change_prepay' && rptItem.nodeType === 2) {
-                            rst = true;
-                            if (rptItem.flags && rptItem.flags.rptTplType) {
-                                if (current_advance_id > 0) {
-                                    rst = !((rptItem.flags.rptTplType || '') === getAdvanceType());
-                                }
-                            }
-                        }
-                        break;
-                    case 'juesuan':
-                        break;
-                    case 'zhifushenpi':
-                        break;
-                    default:
-                        break;
-                }
+                // switch(currentRptType) {
+                //     case 'normal':
+                //         if (rptItem.flags) {
+                //             if (rptItem.flags.dynamicType || rptItem.flags.payAuditType) {
+                //                 if (rptItem.flags.dynamicType && rptItem.flags.dynamicType !== 'N/A') {
+                //                     rst = true;
+                //                     break;
+                //                 }
+                //                 if (rptItem.flags.payAuditType && rptItem.flags.payAuditType !== 'N/A') {
+                //                     rst = true;
+                //                     break;
+                //                 }
+                //             }
+                //         }
+                //         // 检测:预付款
+                //         if (CURRENT_SELECTED_BIZ_TYPE === 'change_prepay' && rptItem.nodeType === 2) {
+                //             rst = true;
+                //             if (rptItem.flags && rptItem.flags.rptTplType) {
+                //                 if (current_advance_id > 0) {
+                //                     rst = !((rptItem.flags.rptTplType || '') === getAdvanceType());
+                //                 }
+                //             }
+                //         }
+                //         break;
+                //     case 'juesuan':
+                //         break;
+                //     case 'zhifushenpi':
+                //         break;
+                //     default:
+                //         break;
+                // }
             }
             return rst;
         };