From 344ada5bc3e41c5fb42ae0e8ac590b64b7cb04ca Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期六, 24 二月 2024 20:30:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 2f1440b..e0e64c2 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -415,9 +415,8 @@
},
tableHeadDataFateher: {
handler(newval, oldval) {
- // console.log(newval)
- if (newval.length > 0) {
- this.options = newval.tableDefineVO.seniorQueryColumns
+ if (Object.keys(newval).length > 0) {
+ this.options = newval.tableDefineVO.seniorQueryColumns;
}
}
},
@@ -629,6 +628,10 @@
this.syncLoading = false;
this.syncDialogBox = false;
this.SyncValue = "";
+ }else {
+ this.syncLoading = false;
+ this.syncDialogBox = false;
+ this.SyncValue = "";
}
} else {
this.$message.warning('璇烽�夋嫨鏈�鍚庢洿鏂版椂闂达紒')
--
Gitblit v1.9.3