diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index 69ca9ae1..b71d2d5a 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -82,40 +82,33 @@ export const constantRoutes = [ { path: 'designer', component: () => import('@/views/workflow/definition/designer'), - name: 'WorkflowDesigner', + name: 'Designer', meta: { title: '流程设计', icon: '' } } ] }, { - path: '/process', + path: '/work', component: Layout, hidden: true, children: [ { path: 'start', - component: () => import('@/views/workflow/process/start'), - name: 'StartProcess', + component: () => import('@/views/workflow/work/start'), + name: 'start', meta: { title: '发起流程', icon: '' } - } - ] - }, - { - path: '/task', - component: Layout, - hidden: true, - children: [ + }, { - path: 'process/index', - component: () => import('@/views/workflow/task/process/index'), - name: 'Record', + path: 'own', + component: () => import('@/views/workflow/work/own'), + name: 'own', meta: { title: '我的流程', icon: '' } }, { - path: 'record/index', - component: () => import('@/views/workflow/task/record/index'), - name: 'Record', - meta: { title: '流程处理', icon: '' } + path: 'detail', + component: () => import('@/views/workflow/work/detail'), + name: 'Detail', + meta: { title: '流程详情', icon: '' } } ] }, diff --git a/ruoyi-ui/src/views/workflow/definition/designer.vue b/ruoyi-ui/src/views/workflow/definition/designer.vue index 2fc2de56..e0dbdc49 100644 --- a/ruoyi-ui/src/views/workflow/definition/designer.vue +++ b/ruoyi-ui/src/views/workflow/definition/designer.vue @@ -15,7 +15,7 @@ import { readXml, saveXml } from "@/api/workflow/definition"; import ProcessDesigner from '@/components/ProcessDesigner'; export default { - name: 'index', + name: 'Designer', components: { ProcessDesigner }, data () { return { diff --git a/ruoyi-ui/src/views/workflow/task/form/index.vue b/ruoyi-ui/src/views/workflow/form/index.vue similarity index 100% rename from ruoyi-ui/src/views/workflow/task/form/index.vue rename to ruoyi-ui/src/views/workflow/form/index.vue diff --git a/ruoyi-ui/src/views/workflow/task/record/index.vue b/ruoyi-ui/src/views/workflow/work/detail.vue similarity index 85% rename from ruoyi-ui/src/views/workflow/task/record/index.vue rename to ruoyi-ui/src/views/workflow/work/detail.vue index b122c118..12fade27 100644 --- a/ruoyi-ui/src/views/workflow/task/record/index.vue +++ b/ruoyi-ui/src/views/workflow/work/detail.vue @@ -82,56 +82,56 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 取 消 @@ -141,21 +141,21 @@ - - - - {{item.name}} - - - - - - - + + + + {{item.name}} + + + + + + + 取 消 确 定 @@ -188,7 +188,7 @@ import Treeselect from '@riophae/vue-treeselect' import { listUser } from '@/api/system/user' export default { - name: "Record", + name: "Detail", components: { ProcessViewer, Parser, @@ -499,7 +499,7 @@ export default { formData.formBtns = false; if (this.taskForm.definitionId) { variables.variables = formData; - // 启动流程并将表单数据加入流程变量 + // 启动流程并将表单数据加入流程变量 definitionStart(this.taskForm.definitionId, JSON.stringify(variables)).then(res => { this.$modal.msgSuccess(res.msg); this.goBack(); @@ -533,7 +533,7 @@ export default { }) }, /** 提交退回任务 */ - taskReturn() { + taskReturn() { this.$refs["taskForm"].validate(valid => { if (valid) { returnTask(this.taskForm).then(res => { diff --git a/ruoyi-ui/src/views/workflow/task/finished/index.vue b/ruoyi-ui/src/views/workflow/work/finished.vue similarity index 81% rename from ruoyi-ui/src/views/workflow/task/finished/index.vue rename to ruoyi-ui/src/views/workflow/work/finished.vue index f336a937..ca78b2dc 100644 --- a/ruoyi-ui/src/views/workflow/task/finished/index.vue +++ b/ruoyi-ui/src/views/workflow/work/finished.vue @@ -60,7 +60,7 @@ icon="el-icon-tickets" @click="handleFlowRecord(scope.row)" >流转记录 - - diff --git a/ruoyi-ui/src/views/workflow/process/index.vue b/ruoyi-ui/src/views/workflow/work/index.vue similarity index 99% rename from ruoyi-ui/src/views/workflow/process/index.vue rename to ruoyi-ui/src/views/workflow/work/index.vue index a890b6ba..49d70ffa 100644 --- a/ruoyi-ui/src/views/workflow/process/index.vue +++ b/ruoyi-ui/src/views/workflow/work/index.vue @@ -87,7 +87,7 @@ import { readXml } from '@/api/workflow/definition' import ProcessViewer from '@/components/ProcessViewer' export default { - name: 'Process', + name: 'WorkProcess', components: { ProcessViewer }, @@ -162,7 +162,7 @@ export default { }, handleStart(row) { this.$router.push({ - path: '/process/start', + path: '/work/start', query: { definitionId: row.definitionId, deployId: row.deploymentId, diff --git a/ruoyi-ui/src/views/workflow/task/process/index.vue b/ruoyi-ui/src/views/workflow/work/own.vue similarity index 70% rename from ruoyi-ui/src/views/workflow/task/process/index.vue rename to ruoyi-ui/src/views/workflow/work/own.vue index a2b04455..ca8e0c51 100644 --- a/ruoyi-ui/src/views/workflow/task/process/index.vue +++ b/ruoyi-ui/src/views/workflow/work/own.vue @@ -25,15 +25,6 @@ - - 新增流程 - - - - - - - - - - - - - - - - - - - diff --git a/ruoyi-ui/src/views/workflow/process/start.vue b/ruoyi-ui/src/views/workflow/work/start.vue similarity index 97% rename from ruoyi-ui/src/views/workflow/process/start.vue rename to ruoyi-ui/src/views/workflow/work/start.vue index 6f791831..dbb99175 100644 --- a/ruoyi-ui/src/views/workflow/process/start.vue +++ b/ruoyi-ui/src/views/workflow/work/start.vue @@ -20,7 +20,7 @@ import { startProcess } from '@/api/workflow/process' import Parser from '@/utils/generator/parser' export default { - name: 'StartProcess', + name: 'Start', components: { Parser }, @@ -79,7 +79,7 @@ export default { startProcess(this.definitionId, JSON.stringify(variables)).then(res => { this.$modal.msgSuccess(res.msg); this.$router.push({ - path: '/task/process/index' + path: '/work/own' }) }) } diff --git a/ruoyi-ui/src/views/workflow/task/todo/index.vue b/ruoyi-ui/src/views/workflow/work/todo.vue similarity index 94% rename from ruoyi-ui/src/views/workflow/task/todo/index.vue rename to ruoyi-ui/src/views/workflow/work/todo.vue index a6bdae0c..e7d933e7 100644 --- a/ruoyi-ui/src/views/workflow/task/todo/index.vue +++ b/ruoyi-ui/src/views/workflow/work/todo.vue @@ -85,13 +85,12 @@ import { returnList, returnTask, rejectTask, - getDeployment, delDeployment, exportDeployment } from "@/api/workflow/todo"; export default { - name: "Deploy", + name: "Todo", components: {}, data() { return { @@ -142,7 +141,7 @@ export default { // 跳转到处理页面 handleProcess(row) { this.$router.push({ - path: '/task/record/index', + path: '/work/detail', query: { definitionId: row.procDefId, procInsId: row.procInsId, @@ -195,16 +194,6 @@ export default { this.open = true; this.title = "添加流程定义"; }, - /** 修改按钮操作 */ - handleUpdate(row) { - this.reset(); - const id = row.id || this.ids - getDeployment(id).then(response => { - this.form = response.data; - this.open = true; - this.title = "修改流程定义"; - }); - }, /** 删除按钮操作 */ handleDelete(row) { const ids = row.id || this.ids; @@ -235,4 +224,3 @@ export default { } }; -