Browse Source

筛选按钮修改

duy 4 days ago
parent
commit
946c85c97d
1 changed files with 37 additions and 16 deletions
  1. 37 16
      src/views/manager/projectinfo/tree.vue

+ 37 - 16
src/views/manager/projectinfo/tree.vue

@@ -105,10 +105,10 @@
                  <el-button type="primary" @click="searchTreeClick1"  v-else size="mini" 
                 >搜索</el-button
               >
-              <el-tooltip content="查询工序节点无内业资料类型" placement="top">
+              
                 <el-button type="success" @click="filterSearchClick"  v-if="isNodeType&&!filterByType" size="mini">筛选</el-button>
                 <el-button type="success" @click="filterSearchClickCancel" v-if="isNodeType&&filterByType" size="mini">取消筛选</el-button>
-              </el-tooltip>
+             
               <el-button
                 v-if="isNodeType"
                 style="margin-right: 10px"
@@ -4073,20 +4073,41 @@ closeOtherExpandedNodes(tree, keepOpenPath) {
       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.searchTreeData = arr;
-          } else {
-            this.searchTreeData = [];
-          }
-        });
+
+        if(!this.filterByType){
+                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.searchTreeData = arr;
+                  } else {
+                    this.searchTreeData = [];
+                  }
+                });
+        }else{
+                    getQueryValueByNodeType({
+                      ...this.filterForm,
+                      queryValue: this.filterText,
+                      wbsId: this.id,
+                      projectId: this.projectid,
+                      
+                    }).then((res) => {
+                        this.filterByType=true
+                      let arr = [];
+                      if (Array.isArray(res.data.data)) {
+                        arr = res.data.data;
+                        this.searchTreeData = arr;
+                      
+                      } else {
+                        this.searchTreeData = [];
+                      }
+                    });
+        }
       } else {
         this.isSearch = false;
       }