From 198607a5dd083ef0f4612bed5205b5a2356b6184 Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期一, 10 七月 2023 11:19:00 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 8506919..dd92b72 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -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,12 @@
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)
} catch (error) {
// 澶勭悊閿欒
this.$message.error(error)
--
Gitblit v1.9.3