From c958ebb34b91f17e52bcc9ca5de11e8087affda5 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 18 十月 2023 11:17:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 0b217db..a620696 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -1,9 +1,11 @@
<template>
- <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="Treedata" :defaultExpandAll="false"
- :option="Treeoption"
- style="height: calc(100vh - 150px);"
- @node-click=" nodeClick"
- ></avue-tree>
+ <div style="overflow: auto; height: calc(100vh - 150px);">
+ <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="Treedata" :defaultExpandAll="false" :option="Treeoption" @node-click="nodeClick" style="width: fit-content;">
+ <template slot-scope="{ node }">
+ <span style="display: inline-block;">{{ node.label }}</span>
+ </template>
+ </avue-tree>
+ </div>
</template>
<script>
@@ -15,7 +17,7 @@
props: {
pageSize: {
type: String,
- default: "10"
+ default: "100"
},
currentPage: {
type: String,
@@ -28,6 +30,7 @@
},
data() {
return {
+ TreeValue:'',
idData: '',
masterVrBtnList: [],
tableHeadFindData: [],
@@ -82,7 +85,7 @@
getTreeList({'conditionMap[id]': this.idData}).then(res => {
if(res){
if(res.data.length === 0){
- this.$message.error("宸︿晶鑿滃崟鏌ヨ涓虹┖");
+ this.$message.error("涓绘暟鎹垎绫绘煡璇负绌猴紒");
}else{
this.Treedata = res.data;
const [firstProperty] = res.data;
@@ -94,7 +97,7 @@
}
}
}).catch(res => {
- console.log(res)
+ // console.log(res)
this.$message.error(res)
});
},
@@ -146,7 +149,7 @@
List.forEach(item => {
let columnItem = {
label: item.title,
- prop: item.field,
+ prop: item.queryField,
// type: this.columnType[item.type],
sortable: item.sort,
width: item.minWidth
@@ -165,6 +168,10 @@
//鏍戠偣鍑讳簨浠�
async nodeClick(data) {
try {
+ // console.log(data)
+ this.TreeValue=data.label.split(" ")[0].trim();
+ console.log('TreeValue',this.TreeValue)
+ this.$emit('TreeValue',this.TreeValue)
this.nodeClickList = data;
this.tableHeadDataFateher = []
this.tableHeadFindData = []
--
Gitblit v1.9.3