收藏夹修改

src/api/modules/tasks/flow.js

@@ -4,7 +4,7 @@ export default {
     //分页数据
     async getPageData(form) {
         return HcApi({
-            url: '/api/blade-business/fixedFlow/page',
+            url: '/api/blade-business/fixedFlow/getFixedFlowPage',
             method: 'get',
             params: form,
         })

src/views/data-fill/wbs.vue

@@ -107,7 +107,7 @@
                                 </el-link>
                             </div>
                             <div
-                                v-if="isSearchTree"
+                                v-if="isSearchTree || folderId"
                                 class="back-button animate-pulse"
                                 @click="handleClick"
                             >
@@ -1635,13 +1635,6 @@ const getSearchTreeData = async (type) => {
         } else if (type === 'hide') {
             response = await collectApi.getHiddenTreeNode({
             
-                  contractId: contractId.value,
-                tableOwner: authBtnTabKey.value,
-               queryValue: searchTreeVal.value,
-            })
-        } else if (type === 'folder') {
-            response = await collectApi.getCollectTreeNode({
-                folderId:folderId.value,
                   contractId: contractId.value,
                 tableOwner: authBtnTabKey.value,
                queryValue: searchTreeVal.value,
@@ -1931,6 +1924,8 @@ const treeLoading = ref(true)
 
 const searchTreeClick = async () => {
     if (searchTreeVal.value) {
+       
+        
         searchTreeHeight.value
             = document.getElementById('hc-tree-scrollbar').offsetHeight
         isSearchTree.value = true
@@ -1938,6 +1933,8 @@ const searchTreeClick = async () => {
         if ( isLookHistory.value) {
               getSearchTreeData('history')
         } else if (folderId.value) {
+           
+              
              getSearchTreeData('folder')
         } else if (!isLookHide.value) {
              getSearchTreeData('hide')
@@ -1949,10 +1946,12 @@ const searchTreeClick = async () => {
       
     } else {
         isSearchTree.value = false
+        
     }
 }
 
 //懒加载的数据
+
 const treeLoadNode = async ({ node, item, level }, resolve) => {
     let contractIdRelation = '',
         parentId = '',
@@ -1963,17 +1962,39 @@ const treeLoadNode = async ({ node, item, level }, resolve) => {
         parentId = contractIdRelation ? nodeData?.primaryKeyId : nodeData?.id
         primaryKeyId = nodeData?.id || ''
     }
-    //获取数据
-    const { data } = await queryApi.queryWbsTreeData({
-        contractId: contractId.value || '',
-        contractIdRelation,
-        primaryKeyId,
-        parentId,
-        // classifyType: authBtnTabKey.value,
-        classifyType: classType.value,
-        tableOwner: authBtnTabKey.value,
-        dataTime:new Date(),
-    })
+    // 获取数据
+    let data = []
+    if (folderId.value) {
+        // 如果folderId.value存在，调用collectApi.getCollectTreeNode
+        let pKeyId = 0
+      
+    if (level !== 0) {
+        const nodeData = getObjValue(item)
+      
+        pKeyId = nodeData?.primaryKeyId || ''
+    }
+        const res = await collectApi.getCollectTreeNode({
+
+            pKeyId,
+            folderId: folderId.value,
+            contractId: contractId.value || '',
+            tableOwner: authBtnTabKey.value,
+            queryValue: searchTreeVal.value,
+        })
+        data = res.data || [] // 假设返回的数据结构中包含data字段
+    } else {
+        // 否则，继续使用原来的queryApi.queryWbsTreeData
+        const { data: resData } = await queryApi.queryWbsTreeData({
+            contractId: contractId.value || '',
+            contractIdRelation,
+            primaryKeyId,
+            parentId,
+            classifyType: classType.value,
+            tableOwner: authBtnTabKey.value,
+            dataTime: new Date(),
+        })
+        data = resData || []
+    }
     treeLoading.value = false
 
     resolve(getArrValue(data))
@@ -3976,6 +3997,8 @@ const handleClick = () => {
   }, 300) // 与CSS过渡时间保持一致
 
    //重新加载左边树
+   folderId.value = ''
+
    isLookHistory.value = false
     isLookHide.value = true
    isSearchTree.value = false
@@ -4249,8 +4272,13 @@ const confirmEdit = async (index, folder) => {
 const selectFolder = async (folder) => {
     collectListVisible.value = false
   folderId.value = folder.id
-    isSearchTree.value = true
-    getSearchTreeData('folder')
+    // isSearchTree.value = true
+    // getSearchTreeData('folder')
+     //重新加载左边树
+        isShowLeft.value = false
+        setTimeout(() => {
+            isShowLeft.value = true
+        }, 500)
  
 }
 
@@ -4270,6 +4298,7 @@ const lookHistory = ()=>{
     isLookHistory.value = true
 
      isSearchTree.value = true
+     folderId.value = ''
     getSearchTreeData('history')
 }
 
@@ -4324,6 +4353,7 @@ const handleClickBack = ()=>{
 const lookHideList = ()=>{
     isLookHide.value = false
     isSearchTree.value = true
+    folderId.value = ''
     getSearchTreeData('hide')
 }
 </script>