From cc3d9886a0b6e6f5e7f834045b10735e3197bb7b Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 09 十一月 2023 19:44:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index bbd9ed5..c1e383e 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -6,7 +6,9 @@
<span v-html="node.label"></span>
</template>
</avue-tree>
- <div style="display: inline-block;"><el-link icon="el-icon-refresh" class="refresh-icon" @click="getTreeLists"></el-link></div>
+ <div style="display: inline-block;">
+ <el-link class="refresh-icon" icon="el-icon-refresh" @click="getTreeLists"></el-link>
+ </div>
</div>
</template>
@@ -34,7 +36,7 @@
return {
TreeValue: '',
idData: '',
- referTreeId:'',
+ referTreeId: '',
masterVrBtnList: [],
tableHeadFindData: [],
tableHeadDataFateher: [],
@@ -57,11 +59,15 @@
// console.log(node)
// console.log(resolve)
// }
- treeLoad: (node, resolve) =>{
+ treeLoad: (node, resolve) => {
if (node.data != false) {
const parentId = (node.level === 0) ? 0 : node.data.oid;
const parentBtmName = node.data.attributes.btmname;
- getTreeList({parentOid: parentId, parentBtmName: parentBtmName,'conditionMap[id]': this.referTreeId }).then(res => {
+ getTreeList({
+ parentOid: parentId,
+ parentBtmName: parentBtmName,
+ 'conditionMap[btmTypeId]': this.referTreeId
+ }).then(res => {
resolve(res.data.map(item => {
return {
...item,
@@ -107,8 +113,8 @@
const [firstProperty] = res.data;
this.ModifyProperties(this.Treedata, 'text', 'label');
- this.referTreeId=firstProperty.attributes.btmTypeId;
- console.log(this.referTreeId)
+ this.referTreeId = firstProperty.attributes.btmTypeId;
+ // console.log(this.referTreeId)
this.codeClassifyOid = firstProperty.oid;
this.coderuleoid = firstProperty.attributes.coderuleoid;
this.$emit("coderuleoid", this.coderuleoid)
--
Gitblit v1.9.3