From cfededd9721be4322e660fc879f11a806fcc7963 Mon Sep 17 00:00:00 2001
From: weidy <lastanimals@163.com>
Date: 星期二, 20 六月 2023 17:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 74 +++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 31 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index c24335f..3163e4a 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:[],
@@ -80,9 +81,7 @@
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 )
- this.TableHeadRends()
}).catch(res=>{
console.log(res)
})
@@ -108,44 +107,57 @@
page: this.currentPage,
limit: this.pageSize,
}).then(res => {
- // this.page.total = res.data.total;
- // this.data = res.data.data;
this.tableDataArray=res.data.data;
this.$emit('tableDataArray',this.tableDataArray)
this.$emit('total',res.data.total)
+ console.log('table',this.tableDataArray)
})
},
//琛ㄦ牸澶撮儴
- TableHeadRend(){
- MasterTable({
- codeClassifyOid:this.nodeClickList.oid,
- functionId: 5,
- }).then(res=>{
- this.tableHeadDataFateher=res.data;
- this.templateOids=res.data.tableDefineVO.oid
- this.$emit("tableHeadDataFateher",this.tableHeadDataFateher)
- console.log("123",res)
- })
- },
- TableHeadRends(){
- MasterTable({
- codeClassifyOid:this.codeClassifyOid,
- functionId: 5,
- }).then(res=>{
- this.tableHeadDataFateher=res.data;
- this.templateOids=res.data.tableDefineVO.oid
- this.$emit("tableHeadDataFateher",this.tableHeadDataFateher)
- console.log("123",res)
+ TableHeadRend() {
+ return new Promise((resolve,reject)=>{
+ MasterTable({
+ codeClassifyOid: this.nodeClickList.oid,
+ functionId: 5,
+ }).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)
+ })
})
},
//鏍戠偣鍑讳簨浠�
- nodeClick(data){
- this.nodeClickList = data;
- this.TableHeadRend()
- this.TableRend()
- console.log('code',this.nodeClickList.oid)
- console.log('teoid',this.templateOids)
- console.log()
+ async nodeClick(data) {
+ try {
+ this.nodeClickList = data;
+ 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.tableHeadFindData)
+ } catch (error) {
+ // 澶勭悊閿欒
+ this.$message.error(error)
+ }
}
}
}
--
Gitblit v1.9.3