Merge branch 'gn_approval' into debug

src/views/system_manage/etaBaseConfig.vue

@@ -275,10 +275,10 @@
                         </div>
 
                         <!-- BI看板审批 -->
-                        <div v-if="isShowBIApprove" style="margin: 20px 0;">
+                        <!-- <div v-if="isShowBIApprove" style="margin: 20px 0;">
                             <span style="color:#606266;">{{$t('SystemManage.BaseConfig.bIDashboard_approval')}}</span> 
                             <el-switch v-model="BIApprove"></el-switch>
-                        </div>
+                        </div> -->
 
                         <!-- 研报logo -->
                         <div>
@@ -755,11 +755,11 @@ export default {
             )
         },
         //是否展示BI看板审批
-        isShowBIApprove(){
-            return this.permissionBtn.checkPermissionBtn(
-                this.permissionBtn.baseConfigPermission.etaBaseConfig_biApprove
-            )
-        },
+        // isShowBIApprove(){
+        //     return this.permissionBtn.checkPermissionBtn(
+        //         this.permissionBtn.baseConfigPermission.etaBaseConfig_biApprove
+        //     )
+        // },
         //是否显示中文PPT相关的表单项
         isShowPPT(){
             return this.permissionBtn.checkPermissionBtn(