From 02a4143e7833f390886695f72a5b689f7c201492 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 25 十二月 2023 18:00:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 7b39aea..12e2074 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -57,10 +57,6 @@
defaultExpandAll: false,
menu: false,
lazy: true,
- // treeLoad:function (node,resolve){
- // console.log(node)
- // console.log(resolve)
- // }
treeLoad: (node, resolve) => {
if (node.data != false) {
const parentId = (node.level === 0) ? 0 : node.data.oid;
@@ -104,15 +100,13 @@
getTreeLists() {
const index = this.$route.query.id.indexOf('@');
const result = this.$route.query.id.substring(0, index);
- this.idData = result
- // console.log(this.$route)
+ this.idData = result;
getTreeList({'conditionMap[id]': this.idData}).then(res => {
if (res) {
if (res.data.length === 0) {
this.$message.error("涓绘暟鎹垎绫绘煡璇负绌猴紒");
} else {
this.Treedata = res.data;
-
const [firstProperty] = res.data;
this.ModifyProperties(this.Treedata, 'text', 'label');
this.referTreeId = firstProperty.attributes.btmTypeId;
@@ -126,11 +120,9 @@
});
this.$emit("coderuleoid", this.coderuleoid)
this.$emit('Treedata', this.Treedata)
- // console.log(this.Treedata)
}
}
}).catch(res => {
- // console.log(res)
this.$message.error(res)
});
},
@@ -188,10 +180,11 @@
List.forEach(item => {
let columnItem = {
label: item.title,
- prop: item.queryField,
+ prop: item.field,
// type: this.columnType[item.type],
sortable: item.sort,
- width: item.minWidth
+ width: item.minWidth,
+ query: item.queryField
};
this.tableHeadFindData.push(Object.assign(item, columnItem))
})
@@ -220,7 +213,6 @@
this.$emit("codeClassifyOid", this.nodeClickList.oid)
this.$emit("nodeClickList", this.nodeClickList)
} catch (error) {
- // 澶勭悊閿欒
this.$message.error(error)
}
}
--
Gitblit v1.9.3