ETA_1.1.7 bug修复

src/views/reportEn/List.vue

@@ -20,8 +20,9 @@ const router=useRouter()
 const showCleanFilterBox=computed(()=>{
     if(isClickClose.value) return false
     if(
+        listState.ClassifyNameRoot ||
         listState.ClassifyNameFirst||
-        listState.ClassifyNameFirst||
+        listState.ClassifyNameSecond||
         listState.EndDate||
         listState.Frequency||
         listState.MsgIsSend||
@@ -30,8 +31,12 @@ const showCleanFilterBox=computed(()=>{
 })
 const isClickClose=ref(false)//是否点击过关闭一键清空模块
 function handleCleanFilter(){
+    listState.ClassifyNameRoot=''
     listState.ClassifyNameFirst=''
     listState.ClassifyNameSecond=''
+    // 重置分类选择器状态
+    classifySelector.value.clearClassifyOptions()
+
     listState.MsgIsSend=''
     listState.Frequency=''
     listState.StartDate=''
@@ -42,7 +47,7 @@ function handleCleanFilter(){
 
 // 分类弹窗
 const showClassify=ref(false)
-
+const classifySelector=ref(null)
 
 const listState = reactive({
     publishStatus:'',
@@ -565,7 +570,7 @@ function handleGoEmailLog(e){
         :style="width>650?{ width: '400px'}:''"
         round
     >
-        <ListClassify @close="showClassify=false" @confirm="handleConfirmClassify"/>
+        <ListClassify @close="showClassify=false" @confirm="handleConfirmClassify" ref="classifySelector"/>
     </van-popup>
 
     <!-- 日期筛选 -->

src/views/reportEn/components/ListClassify.vue

@@ -68,11 +68,18 @@ function handleCancle(){
 }
 
 function handleReset(){
+    activeTab.value=0
     activeIndex.value=0
     activeId.value=null
     emits('confirm',{rootClassify:'',firstClassify:'',secondClassify:''})
 }
 
+function clearClassifyOptions(){
+    activeTab.value=0
+    activeIndex.value=0
+    activeId.value=null
+}
+
 function tabChange(value) {
     activeIndex.value=0
     activeId.value=null
@@ -108,6 +115,10 @@ function handleConfirm(){
     emits('confirm',{rootClassify,firstClassify,secondClassify})
 }
 
+defineExpose({
+    clearClassifyOptions
+})
+
 </script>
 
 <template>