From 6ed94496e774136903031faa441b9c753de86e70 Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Fri, 21 Apr 2023 14:11:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=91=E6=8E=A7=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/process.js | 11 ++- src/api/modules/processCenter.js | 9 +- src/utils/request.js | 5 + .../monitorProcesses/monitorDetail.vue | 98 +++---------------- .../monitorProcesses/monitorModal.vue | 11 +-- .../userCenter/processCenter/sentProcess.vue | 24 ++++- .../processConfig/ProcessMapping.vue | 2 +- src/views/userCenter/processConfig/index.vue | 7 +- 8 files changed, 71 insertions(+), 96 deletions(-) diff --git a/src/api/modules/process.js b/src/api/modules/process.js index 9412cc5..5202417 100644 --- a/src/api/modules/process.js +++ b/src/api/modules/process.js @@ -38,7 +38,7 @@ export default { return request({ url: '/api/createModel', method: 'get', - data: data + params: data }) }, //删除模板 @@ -49,5 +49,14 @@ export default { params: data }) }, + //转办 + changeAssignee (data){ + return request({ + url: '/api/changeAssignee', + method: 'get', + params: data + }) + }, + } diff --git a/src/api/modules/processCenter.js b/src/api/modules/processCenter.js index ffa5765..43ab7b2 100644 --- a/src/api/modules/processCenter.js +++ b/src/api/modules/processCenter.js @@ -46,6 +46,13 @@ export default { params: data, responseType: 'blob', }) + }, + //强制撤回 + getBack(data){ + return request({ + url: '/api/forceRecall', + method: 'GET', + params: data + }) } - } diff --git a/src/utils/request.js b/src/utils/request.js index caf522c..9547e60 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -48,6 +48,11 @@ instance.interceptors.response.use(function (response) { store.commit('saveUserInfo', null) router.push('/login') Message.error('登录超时过期') + //清除vuex + this.$store.commit('saveUserInfo', null) + this.$store.commit('savePathUrl', null) + this.$store.commit('saveMenuName', null) + this.$store.commit('saveMenuData', null) // var url = 'http://192.168.144.22:9966/login?loginType=1' // // var url = 'http://10.64.23.30:7766/home' // diff --git a/src/views/userCenter/processCenter/monitorProcesses/monitorDetail.vue b/src/views/userCenter/processCenter/monitorProcesses/monitorDetail.vue index aa49491..4e705d2 100644 --- a/src/views/userCenter/processCenter/monitorProcesses/monitorDetail.vue +++ b/src/views/userCenter/processCenter/monitorProcesses/monitorDetail.vue @@ -1,6 +1,6 @@ @@ -67,11 +67,31 @@ export default { this.loadData() }, methods: { + //撤回 + withdraw(row){ + this.$confirm('确认强制撤回该条数据？', '强制撤回', { + confirmButtonText: '确定', + cancelButtonText: '取消', + confirmButtonClass: 'common-button-primary', + type: 'warning' + }).then(() => { + this.$api.processCenter.getBack({prcId: row.prcId}).then(res => { + this.$message.success(res.data.message) + this.loadData() + }).catch(err => { + console.log(err) + this.tableData = [{name: 1}] + }) + }) + }, loadData() { let userId=this.$store.getters.userInfo.usid this.$api.processCenter.sentProcessPage({...this.q,...this.searchForm,userId:userId}).then(res=>{ - this.tableData = res.data.list + this.tableData = res.data.list.length>0 ?res.data.list:[{name:1}] this.total = res.data.count + }).catch(err=>{ + console.log(err) + this.tableData = [{name:1}] }) }, // 单页数据量 diff --git a/src/views/userCenter/processConfig/ProcessMapping.vue b/src/views/userCenter/processConfig/ProcessMapping.vue index 83f8461..01e4d1a 100644 --- a/src/views/userCenter/processConfig/ProcessMapping.vue +++ b/src/views/userCenter/processConfig/ProcessMapping.vue @@ -17,7 +17,7 @@ return { modelId : '', name: '', - actUrl: 'http://10.0.10.87:7060/bat-wkflow/modeler.html?modelId=' + actUrl: 'http://10.0.10.173:7060/modeler.html?modelId=' } }, created() { diff --git a/src/views/userCenter/processConfig/index.vue b/src/views/userCenter/processConfig/index.vue index a972c4c..4a30a2f 100644 --- a/src/views/userCenter/processConfig/index.vue +++ b/src/views/userCenter/processConfig/index.vue @@ -39,7 +39,7 @@ @@ -162,7 +162,7 @@ export default { type: 'warning' }).then(() => { - this.$api.process.deploy({id: row.id}).then(res=>{ + this.$api.process.deploy({modelId: row.id}).then(res=>{ this.$message.warning(res.message) this.queryTablePage() }) @@ -286,5 +286,8 @@ export default { padding: 20px 20px; } } +.deleRed{ + color: red !important; +}