From 4681b9a56096763dd94ed0276d2d569a532e2481 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 03 八月 2023 17:12:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 12158d7..a127460 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -81,15 +81,16 @@
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.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)
})
},
@@ -116,7 +117,6 @@
this.tableDataArray=res.data.data;
this.$emit('tableDataArray',this.tableDataArray)
this.$emit('total',res.data.total)
- console.log('table',this.tableDataArray)
})
},
//琛ㄦ牸澶撮儴
@@ -137,7 +137,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,
@@ -151,7 +151,6 @@
this.$emit('tableHeadDataFateher', this.tableHeadDataFateher);
this.$emit('tableHeadFindData', this.tableHeadFindData);
this.$emit('tableHeadBttoms', this.masterVrBtnList);
- console.log( 'head',this.tableHeadFindData)
resolve();
}).catch(err => {
reject(err)
--
Gitblit v1.9.3