From 25ef4e85586c27433c865b69c67ccf5a380b93a7 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期二, 05 十二月 2023 13:52:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 74 ++++++++++++++++++++++++++++--------- 1 files changed, 56 insertions(+), 18 deletions(-) diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue index df6a0b6..e3e913a 100644 --- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue +++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue @@ -99,9 +99,9 @@ </FormTemplateDialog> <!-- 淇--> <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid" - :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'" - :visible.sync="amendvisible" status="amend" - type="edit" @submit="amendSumbit"></FormTemplateDialog> + :disabledProp="disabledProp" :templateOid="templateOid" :title="'鏁版嵁淇'" + :visible.sync="amendvisible" status="amend" :selectRow="selectRow" + type="add" @submit="amendSumbit"></FormTemplateDialog> <!-- 鏂板--> <FormTemplateDialog :TreeValue="TreeValue" :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid" :disabledProp="disabledProp" :templateOid="templateOid" @@ -113,7 +113,7 @@ <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid" :disabledProp="disabledProp" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'" :visible.sync="editvisible" - rowOid="rowOid" + :rowOid="rowOid" type="edit" @submit="EditSumbit"></FormTemplateDialog> <!-- 鎵归噺缂栬緫--> <!-- <MasterEditBulk :visible.sync="bulkeditvisible" ></MasterEditBulk>--> @@ -187,7 +187,8 @@ upSaveCode, applyGroupCode, receiveEditApply, - applySaveCode + applySaveCode, + exportGroupCodeExcel } from "@/api/GetItem"; import {processTS, changeStatus} from "@/api/template/setPersonnel" import {listCodeAttributeByClassId} from "@/api/integration/integration.js"; @@ -485,8 +486,7 @@ this.LinkObject = row; this.LinkVisible = true; this.LinkList = Object.keys(row).map(property => property) - // console.log(result); - // console.log(this.LinkObject) + }, //鐘舵�佹悳绱� cellSelectHandler(row) { @@ -554,7 +554,34 @@ if (uniqueFlag === 'CODEAMEND') return this.codeAMENDHandler() //鎵归噺缂栬緫 if (uniqueFlag === 'bulkEdit') return this.bulkEditHandler("bulkEdit") + //闆嗗洟鐮佸鍑� + if (uniqueFlag === 'excelGroupCode') return this.excelGroupCode() + //闆嗗洟鐮佸鍏� + if (uniqueFlag === 'importGroupCode') return this.importGroupCode("groupCode") }); + }, + importGroupCode(type){ + this.batchImportData.visible = true + this.batchImportData.type = type + this.batchImportData.codeClassifyOid = this.codeClassifyOid + }, + //闆嗗洟鐮佸鍑� + excelGroupCode(){ + debugger + this.isLoading = true; + exportGroupCodeExcel({ + codeClassifyOid: this.codeClassifyOid, + }).then(res => { + console.log(res.data) + if (res) { + func.downloadFileByBlobHandler(res); + this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�'); + this.isLoading = false; + } + }).catch(error=>{ + this.$message.error(error); + this.isLoading = false; + }) }, //鏍囧噯鐢宠 codeApplyHandler() { @@ -589,22 +616,37 @@ //鏍囧噯淇 codeAMENDHandler() { let foundItem = false; - this.tableHeadFindData.forEach(item => { if (item.field === "oldcode" && Object.keys(item.referConfig).length >= 1) { foundItem = true; } }); - if (foundItem) { - this.amendvisible = true; - this.rowOid = this.selectRow[0].oid; + if(this.selectRow.length >= 1){ + this.$confirm('宸叉湁鍙傜収鏄惁鍙栨秷鍕鹃�夌户缁墽琛岋紵', '鎻愮ず', { + confirmButtonText: '纭畾', + cancelButtonText: '鍙栨秷', + type: 'warning' + }).then(() => { + this.selectRow = []; + //鍙栨秷鍕鹃�夌姸鎬� + this.$refs.dataTable.clearSelection(); + this.amendvisible = true; + }).catch(() => { + this.$message({ + type: 'info', + message: '宸插彇娑堝綋鍓嶆搷浣�' + }); + }); + }else { + this.amendvisible = true; + } } else { - if (this.selectRow.length !== 1) { - this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�"); + if (this.selectRow.length <= 0) { + this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�"); } else { this.amendvisible = true; - this.rowOid = this.selectRow[0].oid; + } } }, @@ -613,10 +655,6 @@ // console.log(this.nodeClickList) if (this.nodeClickList.children.length >= 1) { this.$message.warning('褰撳墠閫夋嫨鐨勫垎绫讳笉鏄彾瀛愯妭鐐癸紝涓嶅厑璁告壒閲忕紪杈戯紒') - return; - } - if (this.selectRow.length <= 0) { - this.$message.warning('璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹紒') return; } const Editing = this.selectRow.every(item => item.lcstatus === 'Editing'); -- Gitblit v1.9.3