From c8cdec5a84e86c35fbe7d18ca8eefbe5cbf11ba7 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 08 八月 2023 18:11:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 7a44f87..f165261 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -8,7 +8,6 @@
<script>
import {getTreeList} from "@/api/MasterData/master";
-import {mapMutations, mapState} from "vuex";
import {TableData,MasterTable} from "@/api/GetItem";
export default {
@@ -29,6 +28,7 @@
},
data(){
return{
+ idData:'',
masterVrBtnList:[],
tableHeadFindData:[],
tableHeadDataFateher:[],
@@ -76,16 +76,20 @@
methods:{
//鑾峰彇鏁版嵁
getTreeLists(){
- const fullPath = this.$route.fullPath
- const queryString = fullPath.split('?')[1];
- getTreeList({'conditionMap[id]': queryString}).then(res=>{
- this.Treedata=res.data
+ 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.codeClassifyOid=firstProperty.oid;
+ this.coderuleoid=firstProperty.attributes.coderuleoid;
this.$emit("coderuleoid", this.coderuleoid )
+ this.$emit('Treedata',this.Treedata)
}).catch(res=>{
- console.log(res)
+ this.$message.error(res)
})
},
@@ -112,15 +116,16 @@
this.tableDataArray=res.data.data;
this.$emit('tableDataArray',this.tableDataArray)
this.$emit('total',res.data.total)
- console.log('table',this.tableDataArray)
})
},
//琛ㄦ牸澶撮儴
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: 5,
+ functionId:result,
}).then(res => {
const flagsToDeleteBtn = ["CODEIMPORTHISTORY", "CODEEXPORT", "CODEQUERY","batchApplyCode"];
//涓嶅悓鑺傜偣鏄剧ず涓嶅悓鎸夐挳
@@ -131,7 +136,7 @@
}
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,
--
Gitblit v1.9.3