|
@@ -99,7 +99,8 @@
|
|
>搜索</el-button
|
|
>搜索</el-button
|
|
>
|
|
>
|
|
<el-tooltip content="查询工序节点无内业资料类型" placement="top">
|
|
<el-tooltip content="查询工序节点无内业资料类型" placement="top">
|
|
- <el-button type="success" @click="filterSearchClick" v-if="isNodeType" size="mini">筛选</el-button>
|
|
|
|
|
|
+ <el-button type="success" @click="filterSearchClick" v-if="isNodeType&&!filterByType" size="mini">筛选</el-button>
|
|
|
|
+ <el-button type="success" @click="filterSearchClickCancel" v-else size="mini">取消筛选</el-button>
|
|
</el-tooltip>
|
|
</el-tooltip>
|
|
<el-button
|
|
<el-button
|
|
v-if="isNodeType"
|
|
v-if="isNodeType"
|
|
@@ -2588,6 +2589,7 @@ export default {
|
|
|
|
|
|
return {
|
|
return {
|
|
isNodeType:true,
|
|
isNodeType:true,
|
|
|
|
+ filterByType: false,
|
|
isRestoringSelection: false,
|
|
isRestoringSelection: false,
|
|
|
|
|
|
expandedKeysType: [],
|
|
expandedKeysType: [],
|
|
@@ -3895,29 +3897,15 @@ clearSearch1() {
|
|
|
|
|
|
filterSearchClick(){
|
|
filterSearchClick(){
|
|
this.filterDialog=true;
|
|
this.filterDialog=true;
|
|
-
|
|
|
|
-
|
|
|
|
- //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;
|
|
|
|
|
|
+
|
|
|
|
+ },
|
|
|
|
+ filterSearchClickCancel(){
|
|
|
|
+
|
|
|
|
+ this.filterByType=false
|
|
|
|
+ this.searchTreeClick()
|
|
},
|
|
},
|
|
handleCancel() {
|
|
handleCancel() {
|
|
-
|
|
|
|
|
|
+ this.filterByType=false
|
|
this.filterDialog = false;
|
|
this.filterDialog = false;
|
|
},
|
|
},
|
|
handleConfirm() {
|
|
handleConfirm() {
|
|
@@ -3930,10 +3918,12 @@ clearSearch1() {
|
|
projectId: this.projectid,
|
|
projectId: this.projectid,
|
|
|
|
|
|
}).then((res) => {
|
|
}).then((res) => {
|
|
|
|
+ this.filterByType=true
|
|
let arr = [];
|
|
let arr = [];
|
|
if (Array.isArray(res.data.data)) {
|
|
if (Array.isArray(res.data.data)) {
|
|
arr = res.data.data;
|
|
arr = res.data.data;
|
|
this.searchTreeData = arr;
|
|
this.searchTreeData = arr;
|
|
|
|
+
|
|
} else {
|
|
} else {
|
|
this.searchTreeData = [];
|
|
this.searchTreeData = [];
|
|
}
|
|
}
|