From dedbadd96ab7e1533572b25511fd201678c64dad Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 17 十月 2024 09:56:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 96 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 80 insertions(+), 16 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 14f0d6b..04d6918 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -2,7 +2,7 @@
<basic-container>
<div class="main">
<div class="top">
- <div class="testbox" style="">
+ <div class="testbox">
<div>
</div>
<el-row style="width: 100%;margin-bottom: 10px">
@@ -164,6 +164,22 @@
@current-change="handleCurrentChange">
</el-pagination>
</div>
+ <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"
+ 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">
+ <el-button @click="syncClose">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitSync">纭� 瀹�</el-button>
+ </div>
+ </el-dialog>
</div>
</div>
<div class="bottom">
@@ -188,7 +204,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 +283,10 @@
},
data() {
return {
+ //鎵嬪姩鍚屾model
+ SyncValue: '',
+ syncLoading: false,
+ syncDialogBox: false,
isTimeStatus: false,
isTimeName: '',
dateValue: "",
@@ -373,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
})
@@ -395,7 +414,9 @@
},
tableHeadDataFateher: {
handler(newval, oldval) {
- this.options = newval.tableDefineVO.seniorQueryColumns
+ if (Object.keys(newval).length > 0) {
+ this.options = newval.tableDefineVO.seniorQueryColumns;
+ }
}
},
codeClassifyOid: {
@@ -407,16 +428,22 @@
tableDataArray: {
handler(newval, oldval) {
this.tableData = newval;
- this.searchResults = newval
+ this.searchResults = newval;
this.doLayout();
- this.fileOptions = {
- ownbizOid: "0",
- ownbizBtm: "0",
- fileDocClassify: '!=processAuditSuggest',
- fileDocClassifyName: '',
- hasDownload: true,
- hasUpload: true,
- height: 'auto'
+ if (newval.length > 0) {
+ this.fileOptions = {
+ ownbizOid: "0",
+ ownbizBtm: "0",
+ fileDocClassify: '!=processAuditSuggest',
+ fileDocClassifyName: '',
+ hasDownload: true,
+ hasUpload: true,
+ hasEdit: true,
+ hasDel: true,
+ height: 'auto'
+ }
+ } else {
+ this.fileOptions = {};
}
},
},
@@ -580,8 +607,39 @@
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;
+ },
+ //鎵嬪姩鍚屾纭畾
+ async submitSync() {
+ if (this.SyncValue) {
+ this.syncLoading = true;
+ const response = await syncSearch({endDate: this.SyncValue})
+ 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('璇烽�夋嫨鏈�鍚庢洿鏂版椂闂达紒')
+ }
+ },
+ //闆嗗洟鐮佸鍏�
importGroupCode(type) {
this.batchImportData.visible = true
this.batchImportData.type = type
@@ -1146,7 +1204,6 @@
this.conditionMap = {};
// 瀛樺偍鏌ヨ鏉′欢锛屼富瑕佹槸涓轰簡鐐瑰嚮椤电爜鏃跺甫涓婅繖涓潯浠�
this.conditionMap["conditionMap[" + this.keyWordFind + "]"] = '*' + this.WupinFindValue + '*';
- console.log(this.conditionMap)
TableData({
templateOid: this.templateOid,
codeClassifyOid: this.codeClassifyOid,
@@ -1167,6 +1224,13 @@
</script>
<style lang="scss" scoped>
+
+/deep/ .el-table__fixed-body-wrapper {
+ .el-table__body {
+ padding-bottom: 15px;
+ }
+}
+
//鍥哄畾鍒楅珮搴�
/deep/ .el-table__fixed {
height: calc(100vh - 365px) !important;
@@ -1201,7 +1265,7 @@
.main {
display: flex;
flex-direction: column;
- height: calc(100vh - 150px);
+ height: calc(100vh - 145px);
min-height: 400px;
}
--
Gitblit v1.9.3