Merge branch 'bug4572' into custom

src/utils/buttonConfig.js

@@ -766,6 +766,7 @@ export const baseConfigPermission = {
     etaBaseConfig_login_websiteName_pc:'baseSetting:loginSetting:websiteName:pc',//网站名称移动端
     etaBaseConfig_source_edit:'baseSetting:sourceSetting:edit',//资源库编辑
     etaBaseConfig_source_del:'baseSetting:sourceSetting:del',//资源库删除
+    etaBaseConfig_watermark_ybEnShare:'etaBaseConfig:watermark:ybEnShare',//英文研报抬头
 }
 
 /*-----------外部链接配置-------- */

src/views/system_manage/etaBaseConfig.vue

@@ -287,7 +287,7 @@
                         <el-form-item :label="$t('SystemManage.BaseConfig.report_share_title_zh')" prop="H5ShareName">
                             <el-input type="text" v-model="formData.H5ShareName" :placeholder="$t('SystemManage.BaseConfig.report_share_title_zh_placeholder')" />
                         </el-form-item>
-                        <el-form-item :label="$t('SystemManage.BaseConfig.report_share_title_en')" prop="H5ShareEnName">
+                        <el-form-item :label="$t('SystemManage.BaseConfig.report_share_title_en')" prop="H5ShareEnName" v-if="isShowReportEnShare">
                             <el-input type="text" v-model="formData.H5ShareEnName" :placeholder="$t('SystemManage.BaseConfig.report_share_title_en_placeholder')" />
                         </el-form-item>
                         <el-form-item :label="$t('SystemManage.BaseConfig.connect_wx')" prop="WxAppId">
@@ -724,6 +724,12 @@ export default {
                 this.permissionBtn.baseConfigPermission.etaBaseConfig_source_see
             )
         },
+
+        isShowReportEnShare(){
+            return this.permissionBtn.checkPermissionBtn(
+                this.permissionBtn.baseConfigPermission.etaBaseConfig_watermark_ybEnShare
+            )
+        },
     },
     watch: {
         'isShowLoginConfig':{