Răsfoiți Sursa

按列表搜索树修改

duy 2 ani în urmă
părinte
comite
ca4a0a8837

+ 36 - 22
src/views/manager/projectinfo/tree.vue

@@ -108,6 +108,7 @@
                 v-model="filterText"
                 clearable
                 style="width: 65%;margin-right: 15px;"
+                @clear="clearSearch"
               ></el-input>
               <el-switch
               v-model="searchType"
@@ -127,7 +128,6 @@
                   <el-tree
                   class="filter-tree"
                   lazy
-                  :data="treeData"
                   :load="loadNode"
                   @node-click="getNodeDetail"
                   :props="defaultProps"
@@ -136,6 +136,7 @@
                   node-key="id"
                   ref="tree"
                   :default-expanded-keys="defaultExpandedKeys"
+                  v-show="!isSearch"
                   >
                   <span
                   class="custom-tree-node "
@@ -179,17 +180,15 @@
                    </div>
                 </span>
               </el-tree>
-              <!-- <el-tree
-                v-show="filterText"
-                class="filter-tree"
-                :data="treeData"
+              <el-tree
+                :load="searchtreeLoad"
+                :data="searchTreeData"
                 @node-click="getNodeDetail"
                 :props="defaultProps"
                 :expand-on-click-node="false"
                 highlight-current
                 node-key="id"
-                :filter-node-method="filterNode"
-                ref="treeall"
+                v-show="isSearch"
               >
                   <span
                     class="custom-tree-node "
@@ -225,7 +224,7 @@
                           
                     </div>
                   </span>
-              </el-tree> -->
+              </el-tree>
                 </div>
               </el-scrollbar>
             </div>
@@ -1698,6 +1697,10 @@ export default {
       filterText: "",
       treeData: [],
       searchType:'1',
+      isSearch:false,
+      searchTreeData:[],
+      searchtreeLoad:false,
+
       treeLoad: false,
       menuShow: false,
       defaultProps: {
@@ -2374,25 +2377,36 @@ export default {
     //   });
     // },
     //搜索树
+
+     //搜索树
     searchTreeClick(){
-      this.treeLoad=true
-      getQueryValueByType({
+      if(this.filterText.length>0){
+        this.isSearch=true
+        this.searchtreeLoad=true
+        getQueryValueByType({
         queryValue:this.filterText,
         type:this.searchType,
         wbsId:this.id,
         projectId: this.projectid
-       
-      }).then((res)=>{
-        let arr = [];
-        if (Array.isArray(res.data.data)) {
-          arr = res.data.data;
-          this.treeData=arr
-        }else{
-          this.treeData=[]
-        }
-       
-      })
-      this.treeLoad=false
+        
+        }).then((res)=>{
+          let arr = [];
+          if (Array.isArray(res.data.data)) {
+            arr = res.data.data;
+            this.searchTreeData=arr
+          }else{
+            this.searchTreeData=[]
+          }
+        
+        })
+      }else{
+        this.isSearch=false
+      }
+ 
+      this.searchtreeLoad=false
+    },
+    clearSearch(){
+      this.isSearch=false
     },
     importTemplate(data) {
       this.importTemplateVisible = true;

+ 35 - 21
src/views/manager/wbsinfo/edit.vue

@@ -25,6 +25,7 @@
               v-model="filterText"
               clearable
               style="width: 70%;margin-right: 15px;"
+              @clear="clearSearch"
             ></el-input>
             <el-switch
               v-model="searchType"
@@ -42,6 +43,7 @@
           <el-scrollbar class="h-100p">
             <div>
               <el-tree
+                v-show="!isSearch"
                 class="filter-tree"
                 lazy
                 :load="loadNode"
@@ -94,17 +96,15 @@
                   </div>
                 </span>
               </el-tree>
-              <!-- <el-tree
-                v-show="filterText"
-                class="filter-tree"
-                :data="treeData"
+              <el-tree
+                v-show="isSearch"
+                :data="searchTreeData"
                 @node-click="getNodeDetail"
                 :props="defaultProps"
                 :expand-on-click-node="false"
                 highlight-current
                 node-key="id"
-                :filter-node-method="filterNode"
-                ref="treeall"
+                :load="searchtreeLoad"
               >
                 <span
                   class="custom-tree-node"
@@ -139,7 +139,7 @@
                     </div>
                   </div>
                 </span>
-              </el-tree> -->
+              </el-tree>
             </div>
           </el-scrollbar>
           </div>
@@ -1660,7 +1660,10 @@ export default {
       sort: [],
       id: '',
       filterText: '',
+      isSearch:false,
       treeData: [],
+      searchTreeData:[],
+      searchtreeLoad:false,
       searchType:'1',//搜索类型
       treeLoad: false,
       menuShow: false,
@@ -1919,23 +1922,34 @@ export default {
     },
     //搜索树
     searchTreeClick(){
-      this.treeLoad=true
-      getQueryValueByType({
+      this.searchtreeLoad=true
+
+      if(this.filterText.length>0){
+        this.isSearch=true
+        getQueryValueByType({
         queryValue:this.filterText,
         type:this.searchType,
         wbsId:this.id,
-       
-      }).then((res)=>{
-        let arr = [];
-        if (Array.isArray(res.data.data)) {
-          arr = res.data.data;
-          this.treeData=arr
-        }else{
-          this.treeData=[]
-        }
-       
-      })
-      this.treeLoad=false
+        projectId:''
+        
+        }).then((res)=>{
+          let arr = [];
+          if (Array.isArray(res.data.data)) {
+            arr = res.data.data;
+            this.searchTreeData=arr
+          }else{
+            this.searchTreeData=[]
+          }
+        
+        })
+      }else{
+        this.isSearch=false
+      }
+ 
+      this.searchtreeLoad=false
+    },
+    clearSearch(){
+      this.isSearch=false
     },
 
     getNodeDetail (data, node) {

+ 9 - 1
src/views/util/test.vue

@@ -2,7 +2,14 @@
   <div>
     1111111111
     <basic-container>
-       <onlyoffice-editor :src="src" :config="editorConfig" @ready="onReady" />
+    测试12
+    <el-date-picker
+      v-model="value1"
+      type="datetime"
+      value-format="yyyy-MM-dd HH:mm:ss"
+      format="yyyy-MM-dd HH:mm:ss"
+      placeholder="选择日期时间">
+    </el-date-picker>
     </basic-container>
   </div>
 </template>
@@ -11,6 +18,7 @@
 export default {
   data () {
     return {
+      value1: '',
       // src: 'http://IP/web-apps/apps/api/documents/api.js',
        src: 'http://47.98.223.222:8090/web-apps/apps/api/documents/api.js',
       editorConfig: {