From 970ab1b58ed966f033ebc28fc5ee4ff1b03cbfae Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 11 十二月 2023 18:38:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 6e77ae6..a2a076d 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -47,7 +47,6 @@
CloneTreeAvueform: {},
loading: false,
Treedata: [],
- isLoading: false,
nodeClickList: "",
Treeoption: {
addBtn: false,
@@ -148,14 +147,17 @@
},
//琛ㄦ牸鍒锋柊
TableRend() {
- this.isLoading = true;
+ this.loading = true;
+ this.$emit('loading', this.loading)
TableData({
templateOid: this.templateOids,
codeClassifyOid: this.nodeClickList.oid,
page: this.currentPage,
limit: this.pageSize,
}).then(res => {
- this.isLoading = false;
+ // console.log('tab',res)
+ this.loading = false;
+ this.$emit('loading', this.loading)
this.tableDataArray = res.data.data;
this.$emit('tableDataArray', this.tableDataArray)
this.$emit('total', res.data.total)
@@ -184,7 +186,7 @@
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
--
Gitblit v1.9.3