Merge remote-tracking branch 'origin/thirdStage' into thirdStage

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