From 5d24626495787fbff5974a7e7bd7048dfe0b0ea3 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 26 一月 2024 15:45:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index f18267a..54b5ad0 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -164,6 +164,21 @@
@current-change="handleCurrentChange">
</el-pagination>
</div>
+ <el-dialog title="鎵嬪姩鍚屾" :visible.sync="syncDialogBox"append-to-body @close="syncClose" top="200px">
+ <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 绉�"
+ value-format="yyyy-MM-dd HH:mm:ss">
+ </el-date-picker>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="syncClose">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitSync">纭� 瀹�</el-button>
+ </div>
+ </el-dialog>
</div>
</div>
<div class="bottom">
@@ -188,7 +203,8 @@
applyGroupCode,
receiveEditApply,
applySaveCode,
- exportGroupCodeExcel
+ exportGroupCodeExcel,
+ syncSearch
} from "@/api/GetItem";
import {processTS, changeStatus} from "@/api/template/setPersonnel"
import {listCodeAttributeByClassId} from "@/api/integration/integration.js";
@@ -266,6 +282,9 @@
},
data() {
return {
+ //鎵嬪姩鍚屾model
+ SyncValue:'',
+ syncDialogBox:false,
isTimeStatus: false,
isTimeName: '',
dateValue: "",
@@ -587,8 +606,30 @@
if (uniqueFlag === 'excelGroupCode') return this.excelGroupCode()
//闆嗗洟鐮佸鍏�
if (uniqueFlag === 'importGroupCode') return this.importGroupCode("groupCode")
+ //鎵嬪姩鍚屾
+ if (uniqueFlag === 'manualSyncing') return this.manualSyncing("groupCode")
});
},
+ //鎵嬪姩鍚屾
+ manualSyncing(){
+ this.syncDialogBox = true;
+ },
+ //鎵嬪姩鍚屾鍏抽棴
+ syncClose(){
+ this.syncDialogBox = false;
+ },
+ //鎵嬪姩鍚屾纭畾
+ submitSync(){
+ if(this.SyncValue){
+ syncSearch({enDate:this.SyncValue}).then(res=>{
+ this.$message.success('鍚屾鎴愬姛锛�')
+ this.syncDialogBox = false;
+ })
+ }else {
+ this.$message.warning('璇烽�夋嫨鏈�鍚庢洿鏂版椂闂达紒')
+ }
+ },
+ //闆嗗洟鐮佸鍏�
importGroupCode(type) {
this.batchImportData.visible = true
this.batchImportData.type = type
@@ -1208,7 +1249,7 @@
.main {
display: flex;
flex-direction: column;
- height: calc(100vh - 150px);
+ height: calc(100vh - 145px);
min-height: 400px;
}
--
Gitblit v1.10.0