From 9f38704fb05676220542f639ba85104625c3f446 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期五, 26 一月 2024 15:44:43 +0800 Subject: [PATCH] 添加主数据手动同步,元数据管理添加下拉框条件搜索,业务类型修复bug拆分组件 --- Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 76 ++++++++++++++++++++++++++++++------- 1 files changed, 61 insertions(+), 15 deletions(-) diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue index 09a1570..54b5ad0 100644 --- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue +++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue @@ -18,7 +18,7 @@ <span v-if="tableHeadFindData.length > 0 "> <el-select slot="prepend" v-model="keyWordFind" placeholder="璇烽�夋嫨" size="small" @change="searchChange"> <el-option v-for="item in tableHeadFindData" :key="item.id" :label="item.label" - :value="item.prop"></el-option> + :value="item.query"></el-option> </el-select> <el-input v-if="!isTimeStatus" v-model="WupinFindValue" placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�" size="small" style="width: 180px; margin-left: 5px; margin-top: 10px" @@ -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: "", @@ -318,7 +337,6 @@ key: "oid", label: "name", }, - tableHeadFindDatas: [], applyvisible: false, amendvisible: false, addvisible: false, @@ -396,7 +414,10 @@ }, tableHeadDataFateher: { handler(newval, oldval) { - this.options = newval.tableDefineVO.seniorQueryColumns + // console.log(newval) + if (newval.length > 0) { + this.options = newval.tableDefineVO.seniorQueryColumns + } } }, codeClassifyOid: { @@ -408,16 +429,20 @@ 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, + height: 'auto' + } + } else { + this.fileOptions = {}; } }, }, @@ -448,7 +473,6 @@ // console.log(record) // } }) - this.tableHeadFindDatas = newval; if (newval) { this.CodeArray = []; if (newval.find(item => item.prop === 'id')) { @@ -582,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 @@ -1203,7 +1249,7 @@ .main { display: flex; flex-direction: column; - height: calc(100vh - 150px); + height: calc(100vh - 145px); min-height: 400px; } -- Gitblit v1.9.3