Merge branch 'fix_ETA1.6.7'

src/views/report_manage/reportEn/reportlist.vue

@@ -293,8 +293,8 @@
                   clearable
                   :props="{
                     multiple:true,
-                    value:'EnPermissionId',
-                    label:'EnPermissionName',
+                    value:'PermissionId',
+                    label:'PermissionName',
                     children:'Child'
                   }"
                   :placeholder="$t('ReportManage.ReportList.select_variety_permission')"
@@ -808,7 +808,7 @@ export default {
           // 设置全部选中
           this.popData.varietyOpt.forEach(e=>{
             e.Child.forEach(_e=>{
-              this.popData.varietyVal.push([e.EnPermissionId,_e.EnPermissionId])
+              this.popData.varietyVal.push([e.PermissionId,_e.PermissionId])
             })
           })
         }