From 9b73771165564d8426cf3f2064e51a53bcc930d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Thu, 7 Sep 2023 22:14:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/api/flowable/definition.js | 9 + ruoyi-ui/src/api/publics.js | 10 +- ruoyi-ui/src/components/flow/Role/index.vue | 120 +++++--- .../views/flowable/task/myProcess/index.vue | 52 ++-- .../views/flowable/task/myProcess/myIndex.vue | 279 ------------------ .../project/surProjectSchedule/index.vue | 6 +- .../project/surProjectUserInfo/index.vue | 2 +- .../src/views/video/videoConfig/index.vue | 2 +- 8 files changed, 129 insertions(+), 351 deletions(-) delete mode 100644 ruoyi-ui/src/views/flowable/task/myProcess/myIndex.vue diff --git a/ruoyi-ui/src/api/flowable/definition.js b/ruoyi-ui/src/api/flowable/definition.js index b2803464..a926ef5d 100644 --- a/ruoyi-ui/src/api/flowable/definition.js +++ b/ruoyi-ui/src/api/flowable/definition.js @@ -9,6 +9,15 @@ export function listDefinition(query) { }) } +// 查询流程定义我的角色相关列表 +export function myDefinitionList(query) { + return request({ + url: '/flowable/definition/myList', + method: 'get', + params: query + }) +} + // 部署流程实例 export function definitionStart(procDefId, data) { return request({ diff --git a/ruoyi-ui/src/api/publics.js b/ruoyi-ui/src/api/publics.js index 950a4afa..d6817158 100644 --- a/ruoyi-ui/src/api/publics.js +++ b/ruoyi-ui/src/api/publics.js @@ -22,12 +22,19 @@ const getZgsDeptList = () => { }) } // 获取项目 -const getMyProjectList = () => { +const getProjectList = () => { return request({ url: '/publics/projectList', method: 'get' }) } +// 获取和我相关的项目信息 +const getMyProjectList = () => { + return request({ + url: '/publics/findMyProjectList', + method: 'get' + }) +} // 获取人员 const getUserList = (data) => { return request({ @@ -65,6 +72,7 @@ export default{ getMyDeptList, getDeptTree, getZgsDeptList, + getProjectList, getMyProjectList, getUserList, queryUnitList, diff --git a/ruoyi-ui/src/components/flow/Role/index.vue b/ruoyi-ui/src/components/flow/Role/index.vue index 3c7ffd1d..faae55ef 100644 --- a/ruoyi-ui/src/components/flow/Role/index.vue +++ b/ruoyi-ui/src/components/flow/Role/index.vue @@ -1,6 +1,12 @@