From 83066d37de9a39e0a43bec564bca72fff8a9b18a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 25 十二月 2023 10:11:00 +0800
Subject: [PATCH] 主数据查询条件bug修复
---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index c1e383e..12e2074 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -1,12 +1,14 @@
<template>
- <div class="app" style="display: flex;">
+ <div class="app" style="position: relative;">
<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 }">
- <span v-html="node.label"></span>
+ <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>
</template>
</avue-tree>
- <div style="display: inline-block;">
+ <div style="position: absolute; right: 3px; top: -1px;">
<el-link class="refresh-icon" icon="el-icon-refresh" @click="getTreeLists"></el-link>
</div>
</div>
@@ -55,10 +57,6 @@
defaultExpandAll: false,
menu: false,
lazy: true,
- // treeLoad:function (node,resolve){
- // console.log(node)
- // console.log(resolve)
- // }
treeLoad: (node, resolve) => {
if (node.data != false) {
const parentId = (node.level === 0) ? 0 : node.data.oid;
@@ -102,15 +100,13 @@
getTreeLists() {
const index = this.$route.query.id.indexOf('@');
const result = this.$route.query.id.substring(0, index);
- this.idData = result
- // console.log(this.$route)
+ this.idData = result;
getTreeList({'conditionMap[id]': this.idData}).then(res => {
if (res) {
if (res.data.length === 0) {
this.$message.error("涓绘暟鎹垎绫绘煡璇负绌猴紒");
} else {
this.Treedata = res.data;
-
const [firstProperty] = res.data;
this.ModifyProperties(this.Treedata, 'text', 'label');
this.referTreeId = firstProperty.attributes.btmTypeId;
@@ -124,11 +120,9 @@
});
this.$emit("coderuleoid", this.coderuleoid)
this.$emit('Treedata', this.Treedata)
- // console.log(this.Treedata)
}
}
}).catch(res => {
- // console.log(res)
this.$message.error(res)
});
},
@@ -147,12 +141,17 @@
},
//琛ㄦ牸鍒锋柊
TableRend() {
+ this.loading = true;
+ this.$emit('loading', this.loading)
TableData({
templateOid: this.templateOids,
codeClassifyOid: this.nodeClickList.oid,
page: this.currentPage,
limit: this.pageSize,
}).then(res => {
+ // console.log('tab',res)
+ this.loading = false;
+ this.$emit('loading', this.loading)
this.tableDataArray = res.data.data;
this.$emit('tableDataArray', this.tableDataArray)
this.$emit('total', res.data.total)
@@ -181,10 +180,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))
})
@@ -209,10 +209,10 @@
this.tableHeadFindData = []
await this.TableHeadRend(); // 鍏堟墽琛� TableHeadRend()
this.TableRend(); // TableHeadRend() 鏂规硶瀹屾垚鍚庡啀鎵ц TableRend()
- this.$emit('nodeClick', this.templateOids)
+ this.$emit('nodeClickTemplateOids', this.templateOids)
this.$emit("codeClassifyOid", this.nodeClickList.oid)
+ this.$emit("nodeClickList", this.nodeClickList)
} catch (error) {
- // 澶勭悊閿欒
this.$message.error(error)
}
}
@@ -247,4 +247,7 @@
margin-left: 6px;
font-size: 18px;
}
+#labelSize{
+ font-size: 14px !important;
+}
</style>
--
Gitblit v1.9.3