From 36d3d9da36c71e65081e38cf9cfbd5e0ff6bfeed Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 14 七月 2023 21:15:42 +0800 Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs --- Source/UBCS-WEB/src/components/Master/MasterTree.vue | 88 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 71 insertions(+), 17 deletions(-) diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue index e6f5bd5..cf5f526 100644 --- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue +++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue @@ -1,7 +1,7 @@ <template> <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="Treedata" :defaultExpandAll="false" :option="Treeoption" - style="height: 80.5vh;padding-top: 5px;padding-bottom: 30px" + style="height: calc(100vh - 150px);" @node-click=" nodeClick" ></avue-tree> </template> @@ -9,7 +9,7 @@ <script> import {getTreeList} from "@/api/MasterData/master"; import {mapMutations, mapState} from "vuex"; -import {TableData} from "@/api/GetItem"; +import {TableData,MasterTable} from "@/api/GetItem"; export default { name: "MasterTree", @@ -29,6 +29,10 @@ }, data(){ return{ + masterVrBtnList:[], + tableHeadFindData:[], + tableHeadDataFateher:[], + templateOids:"", tableDataArray:[], codeClassifyOid:"", coderuleoid:"", @@ -65,20 +69,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) @@ -97,23 +100,74 @@ } } }, - //鏍戠偣鍑讳簨浠� - nodeClick(data){ - this.nodeClickList = data; - console.log(this.currentPage,this.pageSize) + //琛ㄦ牸鍒锋柊 + TableRend(){ TableData({ - templateOid: this.templateOid, - codeClassifyOid: this.codeClassifyOid, - page: this.pageSize, - limit:this.currentPage, + templateOid: this.templateOids, + codeClassifyOid: this.nodeClickList.oid, + page: this.currentPage, + limit: this.pageSize, }).then(res => { - console.log(res) - // this.page.total = res.data.total; - // this.data = res.data.data; this.tableDataArray=res.data.data; this.$emit('tableDataArray',this.tableDataArray) - console.log(this.tableDataArray) + this.$emit('total',res.data.total) + console.log('table',this.tableDataArray) }) + }, + //琛ㄦ牸澶撮儴 + TableHeadRend() { + return new Promise((resolve, reject) => { + MasterTable({ + codeClassifyOid: this.nodeClickList.oid, + functionId: 5, + }).then(res => { + console.log('1-', res.data) + console.log('123-', res.data.buttons) + const flagsToDeleteBtn = ["CODEIMPORTHISTORY", "CODEBATCHADD", "CODESTARTPROCESS", "CODEEXPORT", "CODEQUERY"]; + //涓嶅悓鑺傜偣鏄剧ず涓嶅悓鎸夐挳 + if (!res.data.leaf) { + this.masterVrBtnList = res.data.buttons.filter(obj => flagsToDeleteBtn.includes(obj.uniqueFlag)); + } else { + 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(Object.assign(item, 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) + }) + }) + }, + //鏍戠偣鍑讳簨浠� + 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) + } catch (error) { + // 澶勭悊閿欒 + this.$message.error(error) + } } } } -- Gitblit v1.9.3