From f02a461cd0e0c6ad326cd71e3af733e3292407fc Mon Sep 17 00:00:00 2001
From: xiejun <309858992@qq.com>
Date: 星期五, 29 十二月 2023 13:31:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index d1ec150..4d87afc 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -3,8 +3,9 @@
<avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="Treedata" :defaultExpandAll="false"
:option="Treeoption" style="width: fit-content;" @node-click="nodeClick">
<template slot-scope="{ node }">
- <el-tooltip class="item" effect="dark" open-delay="350" :content="$createElement('div', { domProps: { innerHTML: node.label } })" placement="right-start">
- <span id="labelSize" v-html="node.label" ></span>
+ <el-tooltip :content="$createElement('div', { domProps: { innerHTML: node.label } })" class="item" effect="dark"
+ open-delay="350" placement="right-start">
+ <span id="labelSize" v-html="node.label"></span>
</el-tooltip>
</template>
</avue-tree>
@@ -101,6 +102,7 @@
const index = this.$route.query.id.indexOf('@');
const result = this.$route.query.id.substring(0, index);
this.idData = result;
+ this.removeList();
getTreeList({'conditionMap[id]': this.idData}).then(res => {
if (res) {
if (res.data.length === 0) {
@@ -126,7 +128,13 @@
this.$message.error(res)
});
},
-
+ removeList() {
+ this.$emit('tableHeadDataFateher', []);
+ this.$emit('tableHeadFindData', []);
+ this.$emit('tableHeadBttoms', []);
+ this.$emit('tableDataArray', [])
+ this.$emit('total', null)
+ },
//瀹氫箟涓�涓慨鏀规暟鎹睘鎬у悕鐨勬柟娉�
ModifyProperties(obj, oldName, newName) {
for (let key in obj) {
@@ -180,10 +188,11 @@
List.forEach(item => {
let columnItem = {
label: item.title,
- prop: item.queryField,
+ prop: item.field,
// type: this.columnType[item.type],
sortable: item.sort,
- width: item.minWidth
+ width: item.minWidth,
+ query: item.queryField
};
this.tableHeadFindData.push(Object.assign(item, columnItem))
})
@@ -246,7 +255,8 @@
margin-left: 6px;
font-size: 18px;
}
-#labelSize{
+
+#labelSize {
font-size: 14px !important;
}
</style>
--
Gitblit v1.9.3