From f94ded5d0a6545bb564f986bc2db03a989fae662 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 12 三月 2024 10:17:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 2f1440b..3c63ed0 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -164,7 +164,8 @@
@current-change="handleCurrentChange">
</el-pagination>
</div>
- <el-dialog :visible.sync="syncDialogBox" append-to-body title="鎵嬪姩鍚屾" top="200px" @close="syncClose" v-loading="syncLoading"width="30%">
+ <el-dialog v-loading="syncLoading" :visible.sync="syncDialogBox" append-to-body title="鎵嬪姩鍚屾" top="200px"
+ width="30%" @close="syncClose">
<p style="display: inline-block">鏈�鍚庢洿鏂版椂闂达細</p>
<el-date-picker
v-model="SyncValue"
@@ -393,8 +394,6 @@
},
},
created() {
- // const index = this.$route.query.id.indexOf('@name=') + '@name='.length;
- // this.result = this.$route.query.id.substring(index);
getUserInfo().then(res => {
this.result = res.data.data.realName
})
@@ -415,9 +414,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 +438,8 @@
fileDocClassifyName: '',
hasDownload: true,
hasUpload: true,
+ hasEdit: true,
+ hasDel: true,
height: 'auto'
}
} else {
@@ -624,11 +624,16 @@
if (this.SyncValue) {
this.syncLoading = true;
const response = await syncSearch({endDate: this.SyncValue})
- if (response.status === 200) {
+ console.log('response',response)
+ if (response.data.code === 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