From 9c622c05702484fa4942647099cdbdbb3bec50bc Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期一, 19 六月 2023 10:19:56 +0800
Subject: [PATCH] 解决proxy冲突
---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 4664a76..8506919 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,7 +81,6 @@
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,19 @@
}).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)
+ })
this.$emit('tableHeadDataFateher', this.tableHeadDataFateher);
+ this.$emit('tableHeadFindData', this.tableHeadFindData);
resolve();
}).catch(err=>{
reject(err)
@@ -136,7 +148,10 @@
await this.TableHeadRend(); // 鍏堟墽琛� TableHeadRend()
this.TableRend(); // TableHeadRend() 鏂规硶瀹屾垚鍚庡啀鎵ц TableRend()
this.$emit('nodeClick',this.templateOids)
- console.log(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