Merge branch 'ETA1.6.7'

src/views/report/components/EditReportBaseInfo.vue

@@ -200,6 +200,7 @@ function handleSave(){
             :defaultVal="reportBaseInfo.classifyName"
             :noReset="true"
             :hideDayWeek="1" 
+            :enable="1"
             :firstClassifyDisabled="true" 
             @close="showClassifyPop=false" 
             @confirm="handleConfirmClassify"

src/views/report/components/ListClassify.vue

@@ -7,6 +7,7 @@ const props=defineProps({
     noReset:false,
     hideDayWeek:2,
     firstClassifyDisabled:false,//一级分类是否要判断禁用
+    enable:'',
 })
 
 const emits=defineEmits(['close','confirm'])
@@ -17,7 +18,8 @@ function getClassifyList(){
         CurrentIndex:1,
         PageSize:1000,
         KeyWord:'',
-        HideDayWeek:props.hideDayWeek
+        HideDayWeek:props.hideDayWeek,
+        Enabled:props.enable
     }).then(res=>{
         if(res.Ret===200){
             const arr=res.Data.List||[]