From 9cead0735df7fd763f536408f76dec4e5e5bb2c7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 08 十一月 2023 12:39:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 7eb9ae4..4d4bfd5 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -34,6 +34,7 @@
return {
TreeValue: '',
idData: '',
+ referTreeId:'',
masterVrBtnList: [],
tableHeadFindData: [],
tableHeadDataFateher: [],
@@ -56,11 +57,11 @@
// console.log(node)
// console.log(resolve)
// }
- treeLoad: function (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}).then(res => {
+ const parentBtmName = node.data.attributes.btmname;
+ getTreeList({parentOid: parentId, parentBtmName: parentBtmName,'conditionMap[btmTypeId]': this.referTreeId }).then(res => {
resolve(res.data.map(item => {
return {
...item,
@@ -103,8 +104,11 @@
this.$message.error("涓绘暟鎹垎绫绘煡璇负绌猴紒");
} else {
this.Treedata = res.data;
+
const [firstProperty] = res.data;
this.ModifyProperties(this.Treedata, 'text', 'label');
+ 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