Merge branch 'master' into test-dev

src/api/manager/wbstree.js

@@ -368,4 +368,13 @@ export const getQueryValueByType = (params) => {
         method: 'get',
         params
     })
+}
+
+//过滤
+export const getQueryValueByNodeType = (params) => {
+    return request({
+        url: '/api/blade-manager/wbsTree/getQueryValueByNodeType',
+        method: 'get',
+        params
+    })
 }

src/views/manager/projectinfo/tree.vue

@@ -81,6 +81,14 @@
               class="flex"
               style="align-items: center; justify-content: space-between"
             >
+            <div>
+               <div>
+                 <el-radio v-model="searchType" label="1">节点</el-radio>
+               </div>
+                <div>
+                  <el-radio v-model="searchType" label="2">表名</el-radio>
+                </div>
+            </div>
               <el-input
                 placeholder="输入关键字进行过滤"
                 v-model="filterText"
@@ -88,17 +96,14 @@
                 style="width: 65%; margin-right: 15px"
                 @clear="clearSearch"
               ></el-input>
-              <el-switch
-                v-model="searchType"
-                active-value="1"
-                inactive-value="2"
-                inline-prompt
-                active-text="按节点"
-                inactive-text="按表名"
-              />
+             
               <el-button type="primary" @click="searchTreeClick"
                 >搜索</el-button
               >
+             
+              <el-tooltip content="查询工序节点无内业资料类型" placement="top">
+                <el-button type="success" @click="filterSearchClick" >过滤</el-button>
+              </el-tooltip>
             </div>
             <div class="flex1 ov-hidden">
               <el-scrollbar class="h-100p" v-if="isShowTree">
@@ -2169,6 +2174,7 @@ import {
   selectPrivateFormElements,
   syncCurrentFormInProject,
   getQueryValueByType,
+  getQueryValueByNodeType
 } from "@/api/manager/wbstree";
 import {
   saveElement,
@@ -3128,6 +3134,27 @@ export default {
         this.isSearch = false;
       }
 
+      this.searchtreeLoad = false;
+    },
+    filterSearchClick(){
+    
+        this.isSearch = true;
+        this.searchtreeLoad = true;
+        getQueryValueByNodeType({
+          queryValue: this.filterText,
+          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 = [];
+          }
+        });
+      
+
       this.searchtreeLoad = false;
     },
     clearSearch() {