diff --git a/src/api/bpm-boot/activity.ts b/src/api/bpm-boot/activity.ts new file mode 100644 index 00000000..c42cb9fa --- /dev/null +++ b/src/api/bpm-boot/activity.ts @@ -0,0 +1,17 @@ +import createAxios from '@/utils/request' + +import { BPM_BOOT } from '@/utils/constantRequest' + +const MAPPING_PATH = BPM_BOOT + '/bpm/activity' + + +/** + * 生成指定流程实例的高亮流程图 + */ +export const getTaskListByReturn = (processInstanceId: string) => { + return createAxios({ + url: MAPPING_PATH + '/getActivityList?processInstanceId='+processInstanceId, + method: 'GET' + }) +} + diff --git a/src/api/bpm-boot/definition.ts b/src/api/bpm-boot/definition.ts new file mode 100644 index 00000000..47957547 --- /dev/null +++ b/src/api/bpm-boot/definition.ts @@ -0,0 +1,27 @@ +import createAxios from '@/utils/request' + +import { BPM_BOOT } from '@/utils/constantRequest' + +const MAPPING_PATH = BPM_BOOT + '/bpm/processDefinition' + +/** + * 通过任务 + */ +export const approveTask = (data: any) => { + return createAxios({ + url: MAPPING_PATH + '/approve', + method: 'POST', + data: data + }) +} + + +/** + * 获得流程定义 + */ +export const getProcessDefinitionById = (id: string, key: string) => { + return createAxios({ + url: MAPPING_PATH + '/get?id=' + id + '&key=' + key, + method: 'GET' + }) +} diff --git a/src/api/bpm-boot/instance.ts b/src/api/bpm-boot/instance.ts new file mode 100644 index 00000000..fe449d16 --- /dev/null +++ b/src/api/bpm-boot/instance.ts @@ -0,0 +1,28 @@ +import createAxios from '@/utils/request' + +import { BPM_BOOT } from '@/utils/constantRequest' + +const MAPPING_PATH = BPM_BOOT + '/bpm/processInstance' + +/** + * 通过任务 + */ +export const approveTask = (data: any) => { + return createAxios({ + url: MAPPING_PATH + '/approve', + method: 'POST', + data: data + }) +} + + + +/** + * 获得指定流程实例 + */ +export const getProcessInstanceById = (id: string) => { + return createAxios({ + url: MAPPING_PATH + '/get?id='+id, + method: 'GET' + }) +} diff --git a/src/api/bpm-boot/task.ts b/src/api/bpm-boot/task.ts new file mode 100644 index 00000000..d2240e0a --- /dev/null +++ b/src/api/bpm-boot/task.ts @@ -0,0 +1,127 @@ +import createAxios from '@/utils/request' + +import { BPM_BOOT } from '@/utils/constantRequest' + +const MAPPING_PATH = BPM_BOOT + '/bpm/task' + +/** + * 通过任务 + */ +export const approveTask = (data: any) => { + return createAxios({ + url: MAPPING_PATH + '/approve', + method: 'POST', + data: data + }) +} + +/** + * 不通过任务 + */ +export const rejectTask = (data: any) => { + return createAxios({ + url: MAPPING_PATH + '/reject', + method: 'POST', + data: data + }) +} + +/** + * 委派任务 + */ +export const delegateTask = (data: any) => { + return createAxios({ + url: MAPPING_PATH + '/delegate', + method: 'POST', + data: data + }) +} + +/** + * 回退任务 + */ +export const returnTask = (data: any) => { + return createAxios({ + url: MAPPING_PATH + '/return', + method: 'POST', + data: data + }) +} + +/** + * 加签 + */ +export const createSignTask = (data: any) => { + return createAxios({ + url: MAPPING_PATH + '/createSign', + method: 'POST', + data: data + }) +} + +/** + * 减签 + */ +export const deleteSignTask = (data: any) => { + return createAxios({ + url: MAPPING_PATH + '/deleteSign', + method: 'POST', + data: data + }) +} + +/** + * 转派任务 + */ +export const transferTask = (data: any) => { + return createAxios({ + url: MAPPING_PATH + '/transfer', + method: 'POST', + data: data + }) +} + + +/** + * 加签 + */ +export const getTaskListByParentTaskId = (parentTaskId: any) => { + return createAxios({ + url: MAPPING_PATH + '/listByParentTaskId?parentTaskId='+parentTaskId, + method: 'GET' + }) +} + + +/** + * 获取所有可回退的节点 + */ +export const getTaskListByReturn = (id: string) => { + return createAxios({ + url: MAPPING_PATH + '/listByReturn?id='+id, + method: 'GET' + }) +} + + + +/** + * 获得指定流程实例的任务列表 + */ +export const listByProcessInstanceId = (parentTaskId: string) => { + return createAxios({ + url: MAPPING_PATH + '/listByParentTaskId?parentTaskId='+parentTaskId, + method: 'GET' + }) +} + + +/** + * 获得指定流程实例的任务列表 + */ +export const getTaskListByProcessInstanceId = (processInstanceId: string) => { + return createAxios({ + url: MAPPING_PATH + '/listByProcessInstanceId?processInstanceId='+processInstanceId, + method: 'GET' + }) +} diff --git a/src/api/supervision-boot/userReport/form.ts b/src/api/supervision-boot/userReport/form.ts index 704e411f..fcc9d423 100644 --- a/src/api/supervision-boot/userReport/form.ts +++ b/src/api/supervision-boot/userReport/form.ts @@ -2,7 +2,7 @@ import createAxios from '@/utils/request' import { SUPERVISION_BOOT } from '@/utils/constantRequest' -const MAPPING_PATH = SUPERVISION_BOOT + '/workflow/wfForm' +const MAPPING_PATH = SUPERVISION_BOOT + '/userReport' /** * 查询流程表单数据 @@ -14,3 +14,14 @@ export const getUserReport = (data: any) => { data: data }) } + + +/** + * 根据id获取用户档案录入的详细数据 + */ +export const getUserReportById = (id: any) => { + return createAxios({ + url: MAPPING_PATH + '/getById?id='+id, + method: 'GET' + }) +} diff --git a/src/components/icon/src/data.ts b/src/components/icon/src/data.ts index 2a4ed5a3..58d28869 100644 --- a/src/components/icon/src/data.ts +++ b/src/components/icon/src/data.ts @@ -1872,7 +1872,7 @@ export const IconJson = { 'umbrella-beach', 'underline', 'undo', - 'undo-alt', + 'todo-alt', 'union', 'universal-access', 'university', diff --git a/src/components/table/header/index.vue b/src/components/table/header/index.vue index d9791efc..ee673a34 100644 --- a/src/components/table/header/index.vue +++ b/src/components/table/header/index.vue @@ -2,7 +2,7 @@