From 4fda69bcfba7884b9966ad6b1fc0fb8b71018e24 Mon Sep 17 00:00:00 2001 From: smallchill Date: Wed, 8 May 2019 21:12:17 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E5=A2=9E=E5=8A=A0=E6=88=91=E7=9A=84?= =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E5=88=97=E8=A1=A8=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/work/work.js | 79 ++++++++++ src/views/flow/follow.vue | 4 + src/views/flow/manager.vue | 16 +- src/views/flow/model.vue | 8 + src/views/work/claim.vue | 179 +++++++++++++++++++++++ src/views/work/done.vue | 169 ++++++++++++++++++++++ src/views/work/process/leave/detail.vue | 65 +++++++++ src/views/work/process/leave/form.vue | 65 +++++++++ src/views/work/process/leave/handle.vue | 65 +++++++++ src/views/work/send.vue | 178 +++++++++++++++++++++++ src/views/work/start.vue | 185 ++++++++++++++++++++++++ src/views/work/todo.vue | 179 +++++++++++++++++++++++ 12 files changed, 1188 insertions(+), 4 deletions(-) create mode 100644 src/api/work/work.js create mode 100644 src/views/work/claim.vue create mode 100644 src/views/work/done.vue create mode 100644 src/views/work/process/leave/detail.vue create mode 100644 src/views/work/process/leave/form.vue create mode 100644 src/views/work/process/leave/handle.vue create mode 100644 src/views/work/send.vue create mode 100644 src/views/work/start.vue create mode 100644 src/views/work/todo.vue diff --git a/src/api/work/work.js b/src/api/work/work.js new file mode 100644 index 0000000..f4f0c13 --- /dev/null +++ b/src/api/work/work.js @@ -0,0 +1,79 @@ +import request from '@/router/axios'; + +export const startList = (current, size, params) => { + return request({ + url: '/api/blade-flow/work/start-list', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +export const claimList = (current, size, params) => { + return request({ + url: '/api/blade-flow/work/claim-list', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +export const todoList = (current, size, params) => { + return request({ + url: '/api/blade-flow/work/todo-list', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +export const sendList = (current, size, params) => { + return request({ + url: '/api/blade-flow/work/send-list', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + + +export const doneList = (current, size, params) => { + return request({ + url: '/api/blade-flow/work/done-list', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +export const claimTask = (params) => { + return request({ + url: '/api/blade-flow/work/claim-task', + method: 'post', + params + }) +} + + +export const completeTask = (data) => { + return request({ + url: '/api/blade-flow/work/complete-task', + method: 'post', + data + }) +} diff --git a/src/views/flow/follow.vue b/src/views/flow/follow.vue index a934eb0..1e93381 100644 --- a/src/views/flow/follow.vue +++ b/src/views/flow/follow.vue @@ -154,4 +154,8 @@ diff --git a/src/views/flow/manager.vue b/src/views/flow/manager.vue index c070e08..a8ec6fa 100644 --- a/src/views/flow/manager.vue +++ b/src/views/flow/manager.vue @@ -6,9 +6,6 @@ v-model="form" :page="page" :permission="permissionList" - @row-del="rowDel" - @row-update="rowUpdate" - @row-save="rowSave" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange" @@ -27,18 +24,21 @@ size="small" v-if="permission.flow_manager_state" plain + class="none-border" @click.stop="handleState(scope.row,scope.index)">变更状态 流程图 删除 @@ -290,7 +290,11 @@ this.flowBox = true; }, onLoad(page, params = {}) { - managerList(page.currentPage, page.pageSize, params).then(res => { + const values = { + ...params, + category: (params.category) ? `flow_${params.category}` : null + } + managerList(page.currentPage, page.pageSize, values).then(res => { const data = res.data.data; this.page.total = data.total; this.data = data.records; @@ -301,4 +305,8 @@ diff --git a/src/views/flow/model.vue b/src/views/flow/model.vue index ce0774a..95ce20a 100644 --- a/src/views/flow/model.vue +++ b/src/views/flow/model.vue @@ -30,24 +30,28 @@ size="small" v-if="permission.flow_model_update" plain + class="none-border" @click.stop="handleUpdate(scope.row,scope.index)">配置 部署 下载 删除 @@ -289,4 +293,8 @@ diff --git a/src/views/work/claim.vue b/src/views/work/claim.vue new file mode 100644 index 0000000..ef0af4d --- /dev/null +++ b/src/views/work/claim.vue @@ -0,0 +1,179 @@ + + + + + diff --git a/src/views/work/done.vue b/src/views/work/done.vue new file mode 100644 index 0000000..dc9a76d --- /dev/null +++ b/src/views/work/done.vue @@ -0,0 +1,169 @@ + + + + + diff --git a/src/views/work/process/leave/detail.vue b/src/views/work/process/leave/detail.vue new file mode 100644 index 0000000..ac1e65a --- /dev/null +++ b/src/views/work/process/leave/detail.vue @@ -0,0 +1,65 @@ + + + diff --git a/src/views/work/process/leave/form.vue b/src/views/work/process/leave/form.vue new file mode 100644 index 0000000..ac1e65a --- /dev/null +++ b/src/views/work/process/leave/form.vue @@ -0,0 +1,65 @@ + + + diff --git a/src/views/work/process/leave/handle.vue b/src/views/work/process/leave/handle.vue new file mode 100644 index 0000000..ac1e65a --- /dev/null +++ b/src/views/work/process/leave/handle.vue @@ -0,0 +1,65 @@ + + + diff --git a/src/views/work/send.vue b/src/views/work/send.vue new file mode 100644 index 0000000..977ba5e --- /dev/null +++ b/src/views/work/send.vue @@ -0,0 +1,178 @@ + + + + + diff --git a/src/views/work/start.vue b/src/views/work/start.vue new file mode 100644 index 0000000..ca06389 --- /dev/null +++ b/src/views/work/start.vue @@ -0,0 +1,185 @@ + + + + + diff --git a/src/views/work/todo.vue b/src/views/work/todo.vue new file mode 100644 index 0000000..9cafbbc --- /dev/null +++ b/src/views/work/todo.vue @@ -0,0 +1,179 @@ + + + + +