Merge remote-tracking branch 'origin/thirdStage' into thirdStage
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
<div class="page-left-box">
|
||||
<a-input-search class="tree-search" v-model="searchValue" :placeholder="$t('nodeQuickLookup')" @search="onSearch" />
|
||||
<div class="page-tree-box page-tree-box-has-search">
|
||||
<a-spin :spinning="loading">
|
||||
<a-spin :spinning="treeLoading">
|
||||
<a-tree :show-line="true"
|
||||
:show-icon="true"
|
||||
:tree-data="treeData"
|
||||
@@ -225,6 +225,7 @@ export default {
|
||||
return {
|
||||
data: [],
|
||||
loading: false, // 提交的加载
|
||||
treeLoading: false, // 树形区域的加载
|
||||
confirmLoading: false,
|
||||
nodeTreeItem: null, // 右键菜单
|
||||
tmpStyle: '', // 右键菜单位置
|
||||
@@ -371,13 +372,13 @@ export default {
|
||||
infoId: this.infoId,
|
||||
name: this.searchValue
|
||||
}
|
||||
this.loading = true
|
||||
this.treeLoading = true
|
||||
getClauseTreeData(params).then(res => {
|
||||
if (res.success) {
|
||||
this.treeData = res.result || []
|
||||
}
|
||||
}).finally(() => {
|
||||
this.loading = false
|
||||
this.treeLoading = false
|
||||
})
|
||||
},
|
||||
// 用于点击空白处隐藏增删改菜单
|
||||
@@ -643,8 +644,8 @@ export default {
|
||||
if (!fileName || typeof fileName !== 'string') {
|
||||
fileName = '模板文件'
|
||||
}
|
||||
downloadFile(this.url.downTemplateUrl, fileName + fileSuffix, {infoId: this.$route.query.infoId})
|
||||
},
|
||||
downloadFile(this.url.downTemplateUrl, fileName + fileSuffix, { infoId: this.$route.query.infoId })
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user