From 9d8be8e7580ef577def96c852288a5a95eab4ea3 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期二, 11 七月 2023 19:22:53 +0800 Subject: [PATCH] 代码整合,前端代码打包 --- Source/UBCS-WEB/src/components/Master/MasterTree.vue | 81 ++++++++++++++++++++++++---------------- 1 files changed, 48 insertions(+), 33 deletions(-) diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue index c24335f..ea42225 100644 --- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue +++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue @@ -29,6 +29,8 @@ }, data(){ return{ + masterVrBtnList:[], + tableHeadFindData:[], tableHeadDataFateher:[], templateOids:"", tableDataArray:[], @@ -67,22 +69,20 @@ } }, 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 ) - this.TableHeadRends() }).catch(res=>{ console.log(res) }) @@ -108,44 +108,59 @@ 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 => { + 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]; + 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); + this.$emit('tableHeadBttoms', this.masterVrBtnList); + 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; + 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.nodeClickList.oid) + } catch (error) { + // 澶勭悊閿欒 + this.$message.error(error) + } } } } -- Gitblit v1.9.3