From acb7c4c272aa02c2ed24cde72db429defef9fb8f Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 27 七月 2023 13:54:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index ea42225..0aae92f 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{
+ idData:'',
masterVrBtnList:[],
tableHeadFindData:[],
tableHeadDataFateher:[],
@@ -70,18 +71,24 @@
},
created() {
this.getTreeLists()
-
},
computed:{
},
methods:{
//鑾峰彇鏁版嵁
getTreeLists(){
- getTreeList({'conditionMap[id]': 'wupin'}).then(res=>{
+ const index = this.$route.query.id.indexOf('@');
+ const result = this.$route.query.id.substring(0, index);
+ this.idData=result
+ // console.log(this.$route)
+ console.log(this.idData)
+ getTreeList({'conditionMap[id]':this.idData }).then(res=>{
+ console.log(res)
this.Treedata=res.data
+ const [firstProperty] = res.data;
this.ModifyProperties(this.Treedata, 'text', 'label');
- this.codeClassifyOid=res.data[0].oid;
- this.coderuleoid=res.data[0].attributes.coderuleoid;
+ this.codeClassifyOid=firstProperty.oid;
+ this.coderuleoid=firstProperty.attributes.coderuleoid;
this.$emit("coderuleoid", this.coderuleoid )
}).catch(res=>{
console.log(res)
@@ -116,16 +123,23 @@
},
//琛ㄦ牸澶撮儴
TableHeadRend() {
- return new Promise((resolve,reject)=>{
+ const index = this.$route.query.id.indexOf('@');
+ const result = this.$route.query.id.substring(0, index);
+ return new Promise((resolve, reject) => {
MasterTable({
codeClassifyOid: this.nodeClickList.oid,
- functionId: 5,
+ functionId:result,
}).then(res => {
- console.log(res.data.buttons)
- this.masterVrBtnList = res.data.buttons
+ const flagsToDeleteBtn = ["CODEIMPORTHISTORY", "CODEEXPORT", "CODEQUERY","batchApplyCode"];
+ //涓嶅悓鑺傜偣鏄剧ず涓嶅悓鎸夐挳
+ 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];
+ const [List] = res.data.tableDefineVO.cols;
List.forEach(item => {
let columnItem = {
label: item.title,
@@ -134,14 +148,14 @@
sortable: item.sort,
width: item.minWidth
};
- this.tableHeadFindData.push(columnItem)
- // console.log(' this.tableHeadFindData', this.tableHeadFindData)
+ this.tableHeadFindData.push(Object.assign(item, columnItem))
})
this.$emit('tableHeadDataFateher', this.tableHeadDataFateher);
this.$emit('tableHeadFindData', this.tableHeadFindData);
this.$emit('tableHeadBttoms', this.masterVrBtnList);
+ console.log( 'head',this.tableHeadFindData)
resolve();
- }).catch(err=>{
+ }).catch(err => {
reject(err)
})
})
@@ -156,7 +170,6 @@
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