|
@@ -92,10 +92,10 @@
|
|
|
<!-- <DivisionTree :datas="unmatchedTreeData" @nodeTap="divisionTreeClick" @nodeCheck="divisionTreeCheck" :defaultCheckarr="defaultCheckarrIds"/> -->
|
|
|
<KeepAlive>
|
|
|
<template v-if="isSearchTree">
|
|
|
- <DivisionTree :datas="searchTreeData" @nodeTap="divisionTreeClick" @nodeCheck="divisionTreeCheck" :defaultCheckarr="defaultCheckarrIds" :ElTreeProps="seaElTreeProps" :defaultExpandAll="true" :check-strictly="true"/>
|
|
|
+ <DivisionTree :datas="searchTreeData" @nodeTap="divisionTreeClick" @nodeCheck="divisionTreeCheck" :defaultCheckarr="defaultCheckarrIds" :ElTreeProps="seaElTreeProps" :defaultExpandAll="true" :check-strictly="true" :divisionLoading="searchlinksRelateTreeLoading"/>
|
|
|
</template>
|
|
|
<template v-else>
|
|
|
- <DivisionTree :datas="unmatchedTreeData" @nodeTap="divisionTreeClick" @nodeCheck="divisionTreeCheck" :defaultCheckarr="defaultCheckarrIds" :check-strictly="true"/>
|
|
|
+ <DivisionTree :datas="unmatchedTreeData" @nodeTap="divisionTreeClick" @nodeCheck="divisionTreeCheck" :defaultCheckarr="defaultCheckarrIds" :check-strictly="true" :divisionLoading="isdivisionLoading"/>
|
|
|
</template>
|
|
|
</KeepAlive>
|
|
|
</el-scrollbar>
|
|
@@ -320,7 +320,9 @@ const linksRelateModalClick = () => {
|
|
|
//获取导入树
|
|
|
const unmatchedTreeData = ref([])
|
|
|
const defaultCheckarrIds=ref([])
|
|
|
+const isdivisionLoading=ref(false)
|
|
|
const getContractInfoTreeApi = async () => {
|
|
|
+ isdivisionLoading.value=true
|
|
|
const {error, code, data} = await divisionApi.getengineerInfoTree1({
|
|
|
projectId: projectId.value,
|
|
|
contractId: contractId.value,
|
|
@@ -335,6 +337,7 @@ const getContractInfoTreeApi = async () => {
|
|
|
} else {
|
|
|
unmatchedTreeData.value = []
|
|
|
}
|
|
|
+ isdivisionLoading.value=false
|
|
|
}
|
|
|
|
|
|
//关联树
|
|
@@ -366,7 +369,7 @@ const isSearchTree = ref(false)
|
|
|
const searchTreeClick = async () => {
|
|
|
if (linksRelateSearchTreeVal.value) {
|
|
|
isSearchTree.value = true
|
|
|
- searchlinksRelateTreeLoading.value = false
|
|
|
+ searchlinksRelateTreeLoading.value = true
|
|
|
const {error, code, data} = await queryApi.searchContractTree({
|
|
|
contractId: contractId.value,
|
|
|
queryValue: linksRelateSearchTreeVal.value
|
|
@@ -376,12 +379,13 @@ const searchTreeClick = async () => {
|
|
|
searchTreeData.value = getArrValue(data)
|
|
|
searchlinksRelateTreeLoading.value = false
|
|
|
} else {
|
|
|
- searchlinksRelateTreeLoading.value = true
|
|
|
+ searchlinksRelateTreeLoading.value = false
|
|
|
searchTreeData.value = []
|
|
|
}
|
|
|
} else {
|
|
|
searchlinksRelateTreeLoading.value = true
|
|
|
isSearchTree.value = false
|
|
|
+ searchlinksRelateTreeLoading.value = false
|
|
|
}
|
|
|
}
|
|
|
//确认关联
|