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 | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue index ea42225..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> @@ -116,13 +116,20 @@ }, //琛ㄦ牸澶撮儴 TableHeadRend() { - return new Promise((resolve,reject)=>{ + return new Promise((resolve, reject) => { MasterTable({ codeClassifyOid: this.nodeClickList.oid, functionId: 5, }).then(res => { - console.log(res.data.buttons) - this.masterVrBtnList = res.data.buttons + 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]; @@ -134,14 +141,14 @@ sortable: item.sort, width: item.minWidth }; - this.tableHeadFindData.push(columnItem) + 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=>{ + }).catch(err => { reject(err) }) }) @@ -156,7 +163,7 @@ this.TableRend(); // TableHeadRend() 鏂规硶瀹屾垚鍚庡啀鎵ц TableRend() this.$emit('nodeClick',this.templateOids) this.$emit("codeClassifyOid", this.nodeClickList.oid ) - console.log('鏍�',this.nodeClickList.oid) + console.log('鏍�',this.nodeClickList) } catch (error) { // 澶勭悊閿欒 this.$message.error(error) -- Gitblit v1.9.3