From e1beaf409dca5c236dd42bc9f3f3619eeb3e5ae2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 17 七月 2023 14:23:22 +0800
Subject: [PATCH] 代码整合
---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 8506919..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>
@@ -29,6 +29,7 @@
},
data(){
return{
+ masterVrBtnList:[],
tableHeadFindData:[],
tableHeadDataFateher:[],
templateOids:"",
@@ -68,14 +69,14 @@
}
},
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');
@@ -115,11 +116,20 @@
},
//琛ㄦ牸澶撮儴
TableHeadRend() {
- return new Promise((resolve,reject)=>{
+ 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];
@@ -131,12 +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)
})
})
@@ -145,13 +157,13 @@
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.templateOids)
- console.log('鍏冩暟鎹甤od',this.codeClassifyOid)
- console.log('鍏冩暟鎹畁odeclick', this.nodeClickList.oid)
+ console.log('鏍�',this.nodeClickList)
} catch (error) {
// 澶勭悊閿欒
this.$message.error(error)
--
Gitblit v1.9.3