From 87e51a66bbad8eb287755c9ffa91e78345919f8b Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期三, 05 七月 2023 18:15:40 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 4664a76..4d63d27 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{
+ tableHeadFindData:[],
tableHeadDataFateher:[],
templateOids:"",
tableDataArray:[],
@@ -67,20 +68,19 @@
}
},
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');
this.codeClassifyOid=res.data[0].oid;
this.coderuleoid=res.data[0].attributes.coderuleoid;
- this.$emit("codeClassifyOid", this.codeClassifyOid )
this.$emit("coderuleoid", this.coderuleoid )
}).catch(res=>{
console.log(res)
@@ -122,7 +122,20 @@
}).then(res => {
this.tableHeadDataFateher = res.data;
this.templateOids = res.data.tableDefineVO.oid;
+ let List = res.data.tableDefineVO.cols[0];
+ List.forEach(item => {
+ let columnItem = {
+ label: item.title,
+ prop: item.field,
+ // type: this.columnType[item.type],
+ sortable: item.sort,
+ width: item.minWidth
+ };
+ this.tableHeadFindData.push(columnItem)
+ // console.log(' this.tableHeadFindData', this.tableHeadFindData)
+ })
this.$emit('tableHeadDataFateher', this.tableHeadDataFateher);
+ this.$emit('tableHeadFindData', this.tableHeadFindData);
resolve();
}).catch(err=>{
reject(err)
@@ -133,10 +146,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)
- console.log(this.templateOids)
+ this.$emit("codeClassifyOid", this.nodeClickList.oid )
+
} catch (error) {
// 澶勭悊閿欒
this.$message.error(error)
--
Gitblit v1.9.3