fix

src/views/report/List.vue

@@ -649,7 +649,7 @@ onMounted(async ()=>{
                             <span v-permission="reportManageBtn.reportManage_reportList_uv">UV:{{item.Uv}}</span>
                         </div>
                         
-                        <div class="handle-icon" @click.stop="handleOptReportItem(item)">
+                        <div class="handle-icon" @click.stop="handleOptReportItem(item)" v-if="item.ClassifyEnabled">
                             <svg width="24" height="24" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
                                 <path d="M16 8C17.1045 8 18 7.10455 18 6C18 4.89545 17.1045 4 16 4C14.8955 4 14 4.89545 14 6C14 7.10455 14.8955 8 16 8Z" fill="black" fill-opacity="0.9"/>
                                 <path d="M16 18C17.1045 18 18 17.1046 18 16C18 14.8954 17.1045 14 16 14C14.8955 14 14 14.8954 14 16C14 17.1046 14.8955 18 16 18Z" fill="black" fill-opacity="0.9"/>

src/views/report/PreviewDetail.vue

@@ -150,7 +150,7 @@ function handleCopyLink() {
         </div> 
 
         <!-- 浮动操作 -->
-        <div class="fix-bot-action-box">
+        <div class="fix-bot-action-box" v-if="reportInfo&&reportInfo.ClassifyEnabled">
             <div class="item" @click="handleCopyLink" v-permission="reportManageBtn.reportManage_reportView_copyWechat">
                 <img class="icon" src="@/assets/imgs/report/icon_copy.png" alt="">
                 <div>复制链接</div>

src/views/report/components/AddReportBaseInfoV2.vue

@@ -496,6 +496,7 @@ async function handleSave() {
   >
       <ListClassify
         :defaultVal="defaultData?props.defaultData.classifyName:null"
+        :enable="1"
         @close="showClassify=false" 
         @confirm="handleConfirmClassify"
       />
@@ -524,6 +525,10 @@ async function handleSave() {
       <InheritReportSearch
         v-if="isChooseInherReportPop"
         :defaultClassify="reportBaseInfo.classifys"
+        :defaultReport="{
+          id:reportBaseInfo.inheritId,
+          title: reportBaseInfo.title
+        }"
         @close="isChooseInherReportPop=false" 
         @confirm="chooseInheritReport"
       />

src/views/report/components/InheritReportSearch.vue

@@ -10,7 +10,10 @@ const props = defineProps({
     defaultClassify: {
         type: Array,
         default: []
-    }
+    },
+    defaultReport: {
+        type: Object
+    },
 })
 const emit = defineEmits(['close','confirm'])
 
@@ -29,9 +32,10 @@ const statusLabel = computed(() => {
 
 const filterForm = reactive({
     classifys: props.defaultClassify||[],
-    status:''
+    status:'',
+    reportId: props.defaultReport.id||0
 })
-const keyword=ref('')
+const keyword=ref(props.defaultReport.id?props.defaultReport.title:'')
 const selectItem = ref({})
 const listState = reactive({
     list:[],
@@ -45,6 +49,7 @@ async function getList(){
         CurrentIndex:listState.page,
         PageSize:listState.pageSize,
         Keyword:keyword.value,
+        ReportId: filterForm.reportId,
         State: String(filterForm.status),
         ClassifyIdFirst: filterForm.classifys[0]?.id,
         ClassifyIdSecond: filterForm.classifys[1]?.id,
@@ -52,16 +57,23 @@ async function getList(){
     })
     if(res.Ret===200){
         listState.loading=false
-        if(!res.Data){
+        if(!res.Data.List){
             listState.finished=true
             return
         }
         
-        listState.finished=res.Data.Paging.IsEnd
+        listState.finished=res.Data.Paging.Pages>=listState.pageSize;
         const arr=res.Data.List||[]
         listState.list=[...listState.list,...arr]
+
+        
+        if(filterForm.reportId && listState.list.length) {
+            selectItem.value = listState.list[0];
+        }
     }
 }
+filterForm.classifys.length && getList();
+
 function onLoad(){
     console.log('onload');
     listState.page++
@@ -73,18 +85,23 @@ function handleSearch(){
         showToast('请输入关键词')
         return
     }
-    listState.page=1
-    listState.list=[]
-    listState.finished=false
-    getList()
+    filterChange();
+}
+
+function filterChange() {
+    listState.page=1;
+    listState.list=[];
+    listState.finished=false;
+    filterForm.reportId = 0;
+    getList();
 }
 
 
 function handleCancle() {
-  emit('close')
+    emit('close')
 }
 function handleConfirm() {
-  handleCancle()
+    handleCancle()
 	emit('confirm',selectItem.value)
 }
 
@@ -100,10 +117,7 @@ function handleShowClassify() {
 function handleConfirmClassify(arr){
     filterForm.classifys = arr;
     showClassify.value=false
-    listState.page=1
-    listState.list=[]
-    listState.finished=false
-    getList()
+    filterChange();
 }
 
 
@@ -123,10 +137,7 @@ function handleShowStatus() {
 function handleConfirmStatus(e) {
     filterForm.status = e.selectedValues[0];
     showStatusPop.value = false;
-    listState.page=1
-    listState.list=[]
-    listState.finished=false
-    getList()
+    filterChange();
 }
 </script>
 
@@ -154,6 +165,7 @@ function handleConfirmStatus(e) {
                 placeholder="请输入报告标题"
                 v-model="keyword"
                 @search="handleSearch"
+                @clear="filterChange"
             />
         </div>
         
@@ -206,6 +218,7 @@ function handleConfirmStatus(e) {
         round
     >
         <ListClassify
+            :enable="1"
             @close="showClassify=false" 
             @confirm="handleConfirmClassify"
         />