From 41f11d5fd764a2bc7e8463a70bb340467d99a3ca Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 14 七月 2023 09:42:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 8506919..9c1c430 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -1,7 +1,7 @@
<template>
<avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="Treedata" :defaultExpandAll="false"
:option="Treeoption"
- style="height: 80.5vh;padding-top: 5px;padding-bottom: 30px"
+ style="height: calc(100vh - 150px);"
@node-click=" nodeClick"
></avue-tree>
</template>
@@ -29,6 +29,7 @@
},
data(){
return{
+ masterVrBtnList:[],
tableHeadFindData:[],
tableHeadDataFateher:[],
templateOids:"",
@@ -68,14 +69,14 @@
}
},
created() {
- this.getTreeList()
+ this.getTreeLists()
},
computed:{
},
methods:{
//鑾峰彇鏁版嵁
- getTreeList(){
+ getTreeLists(){
getTreeList({'conditionMap[id]': 'wupin'}).then(res=>{
this.Treedata=res.data
this.ModifyProperties(this.Treedata, 'text', 'label');
@@ -120,6 +121,8 @@
codeClassifyOid: this.nodeClickList.oid,
functionId: 5,
}).then(res => {
+ console.log(res.data.buttons)
+ this.masterVrBtnList = res.data.buttons
this.tableHeadDataFateher = res.data;
this.templateOids = res.data.tableDefineVO.oid;
let List = res.data.tableDefineVO.cols[0];
@@ -132,9 +135,11 @@
width: item.minWidth
};
this.tableHeadFindData.push(columnItem)
+ // console.log(' this.tableHeadFindData', this.tableHeadFindData)
})
this.$emit('tableHeadDataFateher', this.tableHeadDataFateher);
this.$emit('tableHeadFindData', this.tableHeadFindData);
+ this.$emit('tableHeadBttoms', this.masterVrBtnList);
resolve();
}).catch(err=>{
reject(err)
@@ -145,13 +150,13 @@
async nodeClick(data) {
try {
this.nodeClickList = data;
+ this.tableHeadDataFateher=[]
+ this.tableHeadFindData=[]
await this.TableHeadRend(); // 鍏堟墽琛� TableHeadRend()
this.TableRend(); // TableHeadRend() 鏂规硶瀹屾垚鍚庡啀鎵ц TableRend()
this.$emit('nodeClick',this.templateOids)
this.$emit("codeClassifyOid", this.nodeClickList.oid )
- console.log('鍏冩暟鎹�',this.templateOids)
- console.log('鍏冩暟鎹甤od',this.codeClassifyOid)
- console.log('鍏冩暟鎹畁odeclick', this.nodeClickList.oid)
+ console.log('鏍�',this.nodeClickList.oid)
} catch (error) {
// 澶勭悊閿欒
this.$message.error(error)
--
Gitblit v1.9.3