From 9ca73b463e490867e52182748d86c2a1a46e454d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 29 二月 2024 15:00:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 7b9018a..a5e7dc5 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;
}
}
},
@@ -440,6 +439,8 @@
fileDocClassifyName: '',
hasDownload: true,
hasUpload: true,
+ hasEdit:true,
+ hasDel:true,
height: 'auto'
}
} else {
@@ -623,12 +624,16 @@
async submitSync() {
if (this.SyncValue) {
this.syncLoading = true;
- const response = await syncSearch({enDate: this.SyncValue})
+ const response = await syncSearch({endDate: this.SyncValue})
if (response.status === 200) {
this.$message.success('鍚屾鎴愬姛锛�')
this.syncLoading = false;
this.syncDialogBox = false;
this.SyncValue = "";
+ }else {
+ this.syncLoading = false;
+ this.syncDialogBox = false;
+ this.SyncValue = "";
}
} else {
this.$message.warning('璇烽�夋嫨鏈�鍚庢洿鏂版椂闂达紒')
--
Gitblit v1.10.0