duy 2 долоо хоног өмнө
parent
commit
ae0cd5404b

+ 7 - 0
src/api/modules/data-fill/collect.js

@@ -67,4 +67,11 @@ export default {
             params: form,
             params: form,
         })
         })
     },
     },
+    async getCollectTreeNodeByQuery(form) {
+        return HcApi({
+            url: '/api//blade-manager/contractInfo/getCollectTreeNodeByQuery',
+            method: 'get',
+            params: form,
+        })
+    },
 }
 }

+ 31 - 1
src/views/data-fill/wbs.vue

@@ -1635,6 +1635,13 @@ const getSearchTreeData = async (type) => {
         } else if (type === 'hide') {
         } else if (type === 'hide') {
             response = await collectApi.getHiddenTreeNode({
             response = await collectApi.getHiddenTreeNode({
             
             
+                  contractId: contractId.value,
+                tableOwner: authBtnTabKey.value,
+               queryValue: searchTreeVal.value,
+            })
+        } else if (type === 'folder') {
+            response = await collectApi.getCollectTreeNodeByQuery({
+                folderId:folderId.value,
                   contractId: contractId.value,
                   contractId: contractId.value,
                 tableOwner: authBtnTabKey.value,
                 tableOwner: authBtnTabKey.value,
                queryValue: searchTreeVal.value,
                queryValue: searchTreeVal.value,
@@ -1666,7 +1673,18 @@ watch(
     ([Collapse, search]) => {
     ([Collapse, search]) => {
         isCollapse.value = Collapse
         isCollapse.value = Collapse
         if (search.length == 0) {
         if (search.length == 0) {
-            isSearchTree.value = false
+          
+            
+            if (!isLookHide.value) {
+                getSearchTreeData('hide')
+                return
+            }
+        if (isLookHistory.value) {
+            
+            getSearchTreeData('history')
+             return
+        }
+                      isSearchTree.value = false
         }
         }
     },
     },
 )
 )
@@ -1945,6 +1963,18 @@ const searchTreeClick = async () => {
 
 
       
       
     } else {
     } else {
+
+
+        if (!isLookHide.value) {
+             console.log(77777)
+            getSearchTreeData('hide')
+             return
+        }
+        if (isLookHistory.value) {
+             console.log(77777)
+            getSearchTreeData('history')
+             return
+        }
         isSearchTree.value = false
         isSearchTree.value = false
         
         
     }
     }