From 6f31eb3ae87f6f1c500ce9d6ad63ffbe861e28ef Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 04 八月 2023 16:34:33 +0800
Subject: [PATCH] 主数据已发布数据更改bug
---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 105 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 65 insertions(+), 40 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index c24335f..a127460 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,9 @@
},
data(){
return{
+ idData:'',
+ masterVrBtnList:[],
+ tableHeadFindData:[],
tableHeadDataFateher:[],
templateOids:"",
tableDataArray:[],
@@ -67,24 +70,27 @@
}
},
created() {
- this.getTreeList()
-
+ this.getTreeLists()
},
computed:{
},
methods:{
//鑾峰彇鏁版嵁
- getTreeList(){
- getTreeList({'conditionMap[id]': 'wupin'}).then(res=>{
- this.Treedata=res.data
+ getTreeLists(){
+ const index = this.$route.query.id.indexOf('@');
+ const result = this.$route.query.id.substring(0, index);
+ this.idData=result
+ // console.log(this.$route)
+ getTreeList({'conditionMap[id]':this.idData }).then(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.$emit("codeClassifyOid", this.codeClassifyOid )
+ this.codeClassifyOid=firstProperty.oid;
+ this.coderuleoid=firstProperty.attributes.coderuleoid;
this.$emit("coderuleoid", this.coderuleoid )
- this.TableHeadRends()
+ this.$emit('Treedata',this.Treedata)
}).catch(res=>{
- console.log(res)
+ this.$message.error(res)
})
},
@@ -108,44 +114,63 @@
page: this.currentPage,
limit: this.pageSize,
}).then(res => {
- // this.page.total = res.data.total;
- // this.data = res.data.data;
this.tableDataArray=res.data.data;
this.$emit('tableDataArray',this.tableDataArray)
this.$emit('total',res.data.total)
})
},
//琛ㄦ牸澶撮儴
- TableHeadRend(){
- MasterTable({
- codeClassifyOid:this.nodeClickList.oid,
- functionId: 5,
- }).then(res=>{
- this.tableHeadDataFateher=res.data;
- this.templateOids=res.data.tableDefineVO.oid
- this.$emit("tableHeadDataFateher",this.tableHeadDataFateher)
- console.log("123",res)
- })
- },
- TableHeadRends(){
- MasterTable({
- codeClassifyOid:this.codeClassifyOid,
- functionId: 5,
- }).then(res=>{
- this.tableHeadDataFateher=res.data;
- this.templateOids=res.data.tableDefineVO.oid
- this.$emit("tableHeadDataFateher",this.tableHeadDataFateher)
- console.log("123",res)
+ TableHeadRend() {
+ 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:result,
+ }).then(res => {
+ 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;
+ const [List] = res.data.tableDefineVO.cols;
+ 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))
+ })
+ this.$emit('tableHeadDataFateher', this.tableHeadDataFateher);
+ this.$emit('tableHeadFindData', this.tableHeadFindData);
+ this.$emit('tableHeadBttoms', this.masterVrBtnList);
+ resolve();
+ }).catch(err => {
+ reject(err)
+ })
})
},
//鏍戠偣鍑讳簨浠�
- nodeClick(data){
- this.nodeClickList = data;
- this.TableHeadRend()
- this.TableRend()
- console.log('code',this.nodeClickList.oid)
- console.log('teoid',this.templateOids)
- console.log()
+ 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 )
+ } catch (error) {
+ // 澶勭悊閿欒
+ this.$message.error(error)
+ }
}
}
}
--
Gitblit v1.9.3