From bd0fa30df80868d68c0a935e543d009e602a9ddc Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期三, 26 七月 2023 14:49:42 +0800
Subject: [PATCH] 1、处理新增保存类型无法保存问题。
---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index dd92b72..12158d7 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,14 +71,18 @@
},
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=>{
this.Treedata=res.data
this.ModifyProperties(this.Treedata, 'text', 'label');
this.codeClassifyOid=res.data[0].oid;
@@ -116,13 +121,20 @@
},
//琛ㄦ牸澶撮儴
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];
@@ -134,14 +146,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)
})
})
--
Gitblit v1.9.3