Merge branch 'bug-fix-5012'

src/views/report_manage/reportAuthor.vue

@@ -14,7 +14,7 @@
       </div>
     </div>
     <div class="main-bottom" v-if="authTabsOpt.length">
-      <ul class="tab-ul">
+      <ul class="tab-ul" v-if="authTabsOpt.length>1">
         <li :class="['tab-li',default_tab===tab.key && 'act']" v-for="tab in authTabsOpt" :key="tab.key" @click="default_tab=tab.key">{{getContentMenuOptText(tab.label)}}</li>
       </ul>
       <el-table

src/views/report_manage/reportVarietyV2.vue

@@ -5,13 +5,20 @@
                 <div 
                     :class="['item',typeVal==1?'active':'']" 
                     @click="handleTypeChange(1)" 
-                    v-permission="permissionBtn.reportVariety.zhVarietyHas">
+                    v-permission="[
+                        permissionBtn.reportVariety.zhVarietyHas,
+                        permissionBtn.reportVariety.enVarietyHas,
+                        'and']"
+                    >
                     {{$t('ReportManage.CommodityConfiguration.chinese_tabs')}}
                 </div>
                 <div 
                     :class="['item',typeVal==2?'active':'']" 
                     @click="handleTypeChange(2)" 
-                    v-permission="permissionBtn.reportVariety.enVarietyHas">
+                    v-permission="[
+                        permissionBtn.reportVariety.enVarietyHas,
+                        permissionBtn.reportVariety.zhVarietyHas,
+                        'and']">
                     {{$t('ReportManage.CommodityConfiguration.english_tabs')}}
                 </div>
             </div>
@@ -226,15 +233,16 @@ export default {
         }
     },
     created(){
-        this.getList()
+        //this.getList()
     },
     mounted(){
         const {reportVariety,checkPermissionBtn} = this.permissionBtn
         if(checkPermissionBtn(reportVariety.zhVarietyHas)){
-            this.type = 1
+            this.typeVal = 1
         }else if(checkPermissionBtn(reportVariety.enVarietyHas)){
-            this.type = 2
+            this.typeVal = 2
         }
+        this.getList()
     },
     methods: {
         async getList(){