资料查询搜索树修改

src/views/data-fill/query.vue

@@ -19,22 +19,23 @@
                         </template>
                     </el-input>
                 </div>
-                <div v-loading="treeLoading" class="hc-tree-scrollbar" element-loading-text="获取数据中...">
-                    <el-scrollbar>
-                        <KeepAlive>
-                            <template v-if="isSearchTree">
-                                <HcTreeData :ElTreeLoadNode="searchElTreeLoadNode" :autoExpandKeys="treeAutoExpandKeys"
-                                            :datas="searchTreeData" :searchTreeVal="searchTreeVal"
-                                            :submitCounts="true"
-                                            isColor
-                                            @changeSearch="changeisSearch"
-                                            @changetreelaod="changetreelaod"
-                                            @nodeTap="wbsElTreeClick"
-                                />
-                            </template>
-                            <template v-else>
-                                <WbsTree
-                                    ref="wbstree"
+                <div v-loading="treeLoading" id="hc-tree-scrollbar" class="hc-tree-scrollbar" element-loading-text="获取数据中...">
+                        <HcTreeDataV2
+                            :isShow="isSearchTree"
+                            :datas="searchTreeData"
+                            :height="searchTreeHeight"
+                           
+                            :searchTreeVal="searchTreeVal"
+                            :submitCounts="true"
+                            :ElTreeLoadNode="searchElTreeLoadNode"
+                            isColor
+                            @changeSearch="changeisSearch"
+                            @changetreelaod="changetreelaod"
+                          
+                            @nodeTap="wbsElTreeClick"/>
+                        <el-scrollbar class="scroll-bar-right-16" v-show="!isSearchTree">
+                            <WbsTree
+                            ref="wbstree"
                                     :autoExpandKeys="treeAutoExpandKeys"
                                     :classifyType="contractTypeTabKey"
                                     :contractId="contractId"
@@ -42,11 +43,8 @@
                                     :submitCounts="true"
                                     :treeKey="wbstreeKey"
                                     isColor
-                                    @nodeTap="wbsElTreeClick"
-                                />
-                            </template>
-                        </KeepAlive>
-                    </el-scrollbar>
+                                    @nodeTap="wbsElTreeClick"/>
+                        </el-scrollbar>
                 </div>
             </div>
             <div class="hc-tree-foot-tip-box">
@@ -209,6 +207,7 @@ import {getStoreValue, setStoreValue} from '~src/utils/storage'
 import {downloadBlob, isString, getObjValue, getArrValue, arrToId} from "js-fast-way"
 import queryApi from '~api/data-fill/query';
 import {eVisaTaskCheckApi} from "~api/other"
+import HcTreeDataV2 from "./components/HcTreeDataV2.vue"
 
 //变量
 const useAppState = useAppStore()
@@ -222,6 +221,7 @@ const wbstree = ref(null)
 const wbstreeKey = ref(Math.random())
 //树搜索
 const isSearchTree = ref(false)
+const searchTreeHeight = ref()
 //监听
 watch(() => [
     useAppState.getCollapse,
@@ -299,6 +299,7 @@ const getSearchTreeDataJl = async () => {
         searchTreeData.value = []
     }
 }
+//回车
 const searchTreeKeyUp = (e) => {
     if (e.key === "Enter") {
         searchTreeClick()
@@ -306,13 +307,15 @@ const searchTreeKeyUp = (e) => {
 }
 
 const searchTreeClick = async () => {
-    treeLoading.value = true
+    searchTreeHeight.value = document.getElementById('hc-tree-scrollbar').offsetHeight;
+    isSearchTree.value = true
+    //treeLoading.value = true
     if (searchElTreeLoadNode.value === true) {
         treeLoading.value = true
-        window?.$message?.warning('请加载完再次点击搜索')
+        window?.$message?.warning('请加载完数据再次进行搜索')
+        searchTreeVal.value=''
     } else {
         isSearchTree.value = true
-        treeLoading.value = false
     }
 }