From 4508f5eb86b063a0f3ec01e6ad68c6ce8ccd1392 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 29 二月 2024 14:34:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 54b5ad0..a5e7dc5 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -164,14 +164,14 @@
@current-change="handleCurrentChange">
</el-pagination>
</div>
- <el-dialog title="鎵嬪姩鍚屾" :visible.sync="syncDialogBox"append-to-body @close="syncClose" top="200px">
+ <el-dialog :visible.sync="syncDialogBox" append-to-body title="鎵嬪姩鍚屾" top="200px" @close="syncClose" v-loading="syncLoading"width="30%">
<p style="display: inline-block">鏈�鍚庢洿鏂版椂闂达細</p>
<el-date-picker
- style="width: 300px"
v-model="SyncValue"
- type="date"
- placeholder="閫夋嫨鏃ユ湡"
format="yyyy 骞� MM 鏈� dd 鏃� HH 鏃� mm 鍒� ss 绉�"
+ placeholder="閫夋嫨鏃ユ湡"
+ style="width: 300px"
+ type="date"
value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
<div slot="footer" class="dialog-footer">
@@ -283,8 +283,9 @@
data() {
return {
//鎵嬪姩鍚屾model
- SyncValue:'',
- syncDialogBox:false,
+ SyncValue: '',
+ syncLoading: false,
+ syncDialogBox: false,
isTimeStatus: false,
isTimeName: '',
dateValue: "",
@@ -414,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;
}
}
},
@@ -439,6 +439,8 @@
fileDocClassifyName: '',
hasDownload: true,
hasUpload: true,
+ hasEdit:true,
+ hasDel:true,
height: 'auto'
}
} else {
@@ -611,21 +613,29 @@
});
},
//鎵嬪姩鍚屾
- manualSyncing(){
+ manualSyncing() {
this.syncDialogBox = true;
},
//鎵嬪姩鍚屾鍏抽棴
- syncClose(){
+ syncClose() {
this.syncDialogBox = false;
},
//鎵嬪姩鍚屾纭畾
- submitSync(){
- if(this.SyncValue){
- syncSearch({enDate:this.SyncValue}).then(res=>{
+ async submitSync() {
+ if (this.SyncValue) {
+ this.syncLoading = true;
+ const response = await syncSearch({endDate: this.SyncValue})
+ if (response.status === 200) {
this.$message.success('鍚屾鎴愬姛锛�')
+ this.syncLoading = false;
this.syncDialogBox = false;
- })
- }else {
+ this.SyncValue = "";
+ }else {
+ this.syncLoading = false;
+ this.syncDialogBox = false;
+ this.SyncValue = "";
+ }
+ } else {
this.$message.warning('璇烽�夋嫨鏈�鍚庢洿鏂版椂闂达紒')
}
},
--
Gitblit v1.9.3