From d7f731c2672c6af00065fcbd1c1164b8789442b8 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期一, 17 七月 2023 17:43:41 +0800 Subject: [PATCH] 7-17主数据导出-配置新按钮 --- Source/UBCS-WEB/.gitignore | 1 Source/UBCS-WEB/src/components/Master/MasterTransfer.vue | 77 +++++++++++++++++++ Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 111 +++++++++++++++++++++++---- Source/UBCS-WEB/src/components/template/SetPersonnel.vue | 4 Source/UBCS-WEB/src/main.js | 3 Source/UBCS-WEB/vue.config.js | 4 Source/UBCS-WEB/src/components/Master/MasterTree.vue | 4 Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 29 +++++-- 8 files changed, 198 insertions(+), 35 deletions(-) diff --git a/Source/UBCS-WEB/.gitignore b/Source/UBCS-WEB/.gitignore index 38bac29..dac7a4b 100644 --- a/Source/UBCS-WEB/.gitignore +++ b/Source/UBCS-WEB/.gitignore @@ -5,6 +5,7 @@ /tests/e2e/videos/ /tests/e2e/screenshots/ + # local env files .env.local .env.*.local diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue index 26286f1..a3c4375 100644 --- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue +++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue @@ -67,15 +67,20 @@ :type="edit" :visible.sync="DataVisible"></FormTemplateDialog> <!-- 鍙戝竷--> - <set-personnel :parameter="this.parameter" :visible.sync="visibleFlow"></set-personnel> + <set-personnel :parameter="this.parameter" :visible.sync="visibleFlow" :title="title"></set-personnel> +<!-- 鍋滅敤--> + <set-personnel :parameter="this.parameter" :visible.sync="visibleDeactivate" :title="title"></set-personnel> +<!-- 鍚敤--> + <set-personnel :parameter="this.parameter" :visible.sync="visibleEnable" :title="title"></set-personnel> +<!-- 鍥炴敹--> + <set-personnel :parameter="this.parameter" :visible.sync="visibleRecovery" :title="title"></set-personnel> <!-- 楂樼骇鏌ヨ--> <advanced-query :options="this.options" :visible.sync="findvisible" @echoContion="echoContion"></advanced-query> - - <integration-transfer :data="transferData" :props="transferProps" :visible.sync="dialogPush" - @save="handelTransferSave"></integration-transfer> +<!-- 瀵煎嚭--> + <MasterTransfer :visible.sync="dialogPush" :tableHeadData="tableHeadFindData"></MasterTransfer> +<!-- 鐩镐技椤�--> <ResembleQueryDialog :codeClassifyOid="codeClassifyOid" :codeRuleOid="this.codeRuleOid" :rowOid="rowOid" :templateOid="templateOid" :visible.sync="similarVisible"></ResembleQueryDialog> - <div class="block" style="display: flex; justify-content: flex-end"> <el-pagination :current-page="page.currentPage" :page-size="page.pageSizes" :page-sizes="page.pageSizes" :total="page.total" layout="total, sizes, prev, pager, next, jumper" @@ -166,7 +171,8 @@ parameter: { ids: [], code: "", - type: "PUBLIC", + type: '', + // this.visibleDeactivate ?'ENABLE':this.visibleEnable ? 'DISABLE' :this.visibleRecovery ? 'ROLLBACK' :'PUBLIC' template: "", vars: { codeClassifyOid: "", @@ -174,7 +180,15 @@ } }, visibleNames:[], + //鍙戝竷 visibleFlow: false, + //鍋滅敤 + visibleDeactivate:false, + //鍚敤 + visibleEnable:false, + //鍥炴敹 + visibleRecovery:false, + title:'', transferData: [], transferProps: { key: "oid", @@ -308,16 +322,6 @@ this.$refs.dataTable.doLayout() } }, - // 鍙戝竷 - setHandler() { - if (this.selectRow.length <= 0) { - this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�"); - } else { - this.userName = localStorage.getItem("username"); - this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]"; - this.visibleFlow = true; - } - }, openVis(visible) { console.log(visible) this[visible] = true @@ -334,9 +338,14 @@ // if(uniqueFlag === 'CODEEDIT') return this.openBatchImport('batchApplyCode') if (uniqueFlag === 'CODESTARTPROCESS') return this.setHandler() if (uniqueFlag === 'CODEUPREVISION') return this.DataChange() - if (uniqueFlag === 'CODERECYCLE') return this.huishouHandler() if (uniqueFlag === 'CODEEXPORT') return this.openD() if (uniqueFlag === 'CODEQUERY') return this.findHandler() + //鍋滅敤 + if (uniqueFlag === 'CODEDISABLE') return this.Deactivate() + //鍚敤 + if (uniqueFlag === 'CODEENABLE') return this.Enable() + //鍥炴敹 + if (uniqueFlag === 'CODERECYCLE') return this.Recovery() // 鐩镐技椤规煡璇� // if(uniqueFlag === 'CODEEDIT') return this.similarHandler() }); @@ -361,6 +370,74 @@ rend() { this.tableData = this.tableHeadData; }, + // 鍙戝竷 + setHandler() { + // let EditFlag1=false + // let EditFlag2=false + // if(EditFlag1){ + // this.$message.warning('鍙湁鐘舵�佹槸銆愮紪杈戜腑銆戠殑鏁版嵁鎵嶅彲浠ュ彂璧锋祦绋�') + // }else if(EditFlag2){ + // this.$message.warning('鎮ㄩ�夋嫨鐨勬暟鎹叏閮ㄤ负銆愮紪杈戜腑銆戞墠鍙互鍙戣捣娴佺▼') + // } + this.selectRow.forEach(item=>{ + if(this.selectRow.length === 1 && item.lcstatus !== "Editing"){ + this.$message.warning('鍙湁鐘舵�佹槸銆愮紪杈戜腑銆戠殑鏁版嵁鎵嶅彲浠ュ彂璧锋祦绋�') + }else if(item.lcstatus !== 'Editing'){ + this.$message.warning('鎮ㄩ�夋嫨鐨勬暟鎹叏閮ㄤ负銆愮紪杈戜腑銆戞墠鍙互鍙戣捣娴佺▼') + }else { + this.userName = localStorage.getItem("username"); + this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]"; + this.parameter.type='PUBLIC' + this.title='娴佺▼瀹℃壒' + this.visibleFlow = true; + } + }) + // if (this.selectRow.length <= 0) { + // this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�"); + // } else { + // this.userName = localStorage.getItem("username"); + // this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]"; + // this.parameter.type='PUBLIC' + // this.title='娴佺▼瀹℃壒' + // this.visibleFlow = true; + // } + }, + //鍋滅敤 + Deactivate(){ + if (this.selectRow.length <= 0) { + this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�"); + } else { + this.userName = localStorage.getItem("username"); + this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]"; + this.parameter.type='DISABLE' + this.title='鍋滅敤锛堝喕缁擄級缂栫爜鏁版嵁' + this.visibleDeactivate=true; + } + }, + //鍚敤 + Enable(){ + if (this.selectRow.length <= 0) { + this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�"); + } else { + this.userName = localStorage.getItem("username"); + this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]"; + this.parameter.type='ENABLE' + this.title='鍚敤锛堣В鍐伙級缂栫爜鏁版嵁' + this.visibleEnable=true; + } + }, + //鍥炴敹 + Recovery(){ + if (this.selectRow.length <= 0) { + this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�"); + } else { + this.userName = localStorage.getItem("username"); + this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]"; + this.parameter.type='ROLLBACK' + this.title='鍥炴敹缂栫爜鏁版嵁' + this.visibleRecovery=true; + } + }, handleSizeChange(val) { this.isLoading = true; setTimeout(() => { diff --git a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue new file mode 100644 index 0000000..ccfc623 --- /dev/null +++ b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue @@ -0,0 +1,77 @@ +<template> +<el-dialog :visible.sync="dialogPush" append-to-body :close-on-click-modal="false" @close="recoverPage" title="瀵煎嚭"> + <div style="margin-bottom: 10px"> + <el-radio-group v-model="radio"> + <el-radio :label="0">閫夋嫨</el-radio> + <el-radio :label="1">鍏ㄩ儴</el-radio> + <el-radio :label="2">椤电爜</el-radio> + </el-radio-group> + </div> + <div style="text-align: center"> + <el-transfer + style="text-align: left; display: inline-block" + filterable + :filter-method="filterMethod" + filter-placeholder="璇疯緭鍏ュ煄甯傛嫾闊�" + v-model="value" + :data="data"> + </el-transfer> + </div> +</el-dialog> +</template> + +<script> +export default { +name: "MasterTransfer", + props:['visible','tableHeadData'], + data(){ + const generateData = () => { + const data = []; + const cities = ['涓婃捣', '鍖椾含', '骞垮窞', '娣卞湷', '鍗椾含', '瑗垮畨', '鎴愰兘']; + cities.forEach((city, index) => { + data.push({ + label: city, + key: index, + }); + }); + return data; + }; + return { + data: generateData(), + value: [], + filterMethod(query, item) { + return item.label.indexOf(query) > -1; + }, + dialogPush:this.visible, + radio:0, + tableHeadFindData:[] + }; + }, + watch:{ + //鐩戝惉鍒濆鍖� + visible (){ + this.dialogPush = this.visible; + }, + tableHeadData(){ + this.tableHeadFindData=this.tableHeadData; + + } + }, + computed:{ + + }, + mounted() { + console.log(this.tableHeadData) + }, + methods:{ + //鍏抽棴椤甸潰 + recoverPage(){ + this.$emit('update:visible', false); + } + } +} +</script> + +<style scoped lang="scss"> + +</style> diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue index cf5f526..2a583b3 100644 --- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue +++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue @@ -121,9 +121,7 @@ codeClassifyOid: this.nodeClickList.oid, functionId: 5, }).then(res => { - console.log('1-', res.data) - console.log('123-', res.data.buttons) - const flagsToDeleteBtn = ["CODEIMPORTHISTORY", "CODEBATCHADD", "CODESTARTPROCESS", "CODEEXPORT", "CODEQUERY"]; + const flagsToDeleteBtn = ["CODEIMPORTHISTORY", "CODEEXPORT", "CODEQUERY","batchApplyCode"]; //涓嶅悓鑺傜偣鏄剧ず涓嶅悓鎸夐挳 if (!res.data.leaf) { this.masterVrBtnList = res.data.buttons.filter(obj => flagsToDeleteBtn.includes(obj.uniqueFlag)); diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue index 7c68f93..cc66270 100644 --- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue +++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue @@ -242,7 +242,7 @@ </div> <el-table :data="ProData" style="width: 100%" - height="280" + height="750" @cell-click="handleCellClicks" @select="selectHandle" @selection-change="selectionChange" @@ -1637,15 +1637,26 @@ }, //鏋氫妇娉ㄥ叆淇濆瓨 enumAddHandle() { - if (this.enumRow.length < 1) { - this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�') - } else { - if(this.CurrentCell){ - this.$set(this.CurrentCell, 'enumString', JSON.stringify(this.enumRow)); + let hasError = false; // 娣诲姞涓�涓彉閲� + this.tableData.forEach((item, index) => { + if (item.key === '') { + this.$message.warning(`绗�${index + 1}琛岀殑閫夐」鍊间笉鑳戒负绌篳); + hasError = true; + return; + } else if (item.value === '') { + this.$message.warning(`绗�${index + 1}琛岀殑閫夐」涓枃鏍囩涓嶈兘涓虹┖`); + hasError = true; + return; + } + }); + // 淇濆瓨鎵ц閫昏緫 + if (!hasError) { + if (this.CurrentCell) { + this.$set(this.CurrentCell, 'enumString', JSON.stringify(this.tableData)); this.enumVisible = false; - }else { - this.$set(this.attrSelectList[0], 'enumString', JSON.stringify(this.enumRow)); - this.tableData=[] + } else { + this.$set(this.attrSelectList[0], 'enumString', JSON.stringify(this.tableData)); + this.tableData=[]; this.enumVisible = false; } } diff --git a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue index 2c7a417..cf03538 100644 --- a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue +++ b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue @@ -118,10 +118,8 @@ }, mounted() { - console.log('---',this.parameter) }, - created() { - console.log('parameter',this.parameter) + created() { }, methods: { setSaveParam() { diff --git a/Source/UBCS-WEB/src/main.js b/Source/UBCS-WEB/src/main.js index 7ad2bdd..ae013f3 100644 --- a/Source/UBCS-WEB/src/main.js +++ b/Source/UBCS-WEB/src/main.js @@ -51,7 +51,7 @@ import FlowPath from "@/components/template/FlowPath"; import Stage from "@/components/template/Stage"; import businesswork from "@/components/work/BusinessWork" - +import MasterTransfer from "@/components/Master/MasterTransfer"; // 灏嗗伐鍏峰嚱鏁版坊鍔犲埌鍏ㄥ眬 import utilFunc from './util/func' import flowPath from "@/views/flow/flowPath"; @@ -104,6 +104,7 @@ Vue.component('Stage',Stage) Vue.component('Divider', Divider) Vue.component('businesswork', businesswork) +Vue.component('MasterTransfer', MasterTransfer) // 鍔犺浇鐩稿叧url鍦板潃 Object.keys(urls).forEach(key => { diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js index ad43a75..63a88c9 100644 --- a/Source/UBCS-WEB/vue.config.js +++ b/Source/UBCS-WEB/vue.config.js @@ -26,9 +26,9 @@ proxy: { '/api': { //鏈湴鏈嶅姟鎺ュ彛鍦板潃 - target: 'http://localhost:37000', + // target: 'http://localhost:37000', // target: 'http://192.168.1.51:37000', - // target: 'http://192.168.1.46:37000', + target: 'http://192.168.1.46:37000', // target: 'http://dev.vci-tech.com:37000', // target: 'http://192.168.1.51:37000/', // target: 'http://192.168.1.104:37000', -- Gitblit v1.9.3