diff --git a/src/api/platform/workflow/controller/process.ts b/src/api/platform/workflow/controller/process.ts index ee03d7a..252240d 100644 --- a/src/api/platform/workflow/controller/process.ts +++ b/src/api/platform/workflow/controller/process.ts @@ -8,6 +8,7 @@ import type { ProcessInstanceInfoResult } from '/@/api/platform/workflow/entity/ import type { Workflow } from '/@/api/platform/workflow/entity/workflow'; import type { ResponseEntity } from '/#/axios'; import { defHttp } from '/@/utils/http/axios'; +import type { ProcessInstanceInfo } from '/@/api/platform/workflow/entity/processInstanceInfo'; enum Api { list = '/workflow_proxy/workflow/process/list', @@ -52,7 +53,7 @@ export const undoProcessInstance = (processInsId: string) => defHttp.put({ url: export const stopProcessInstance = (processInsId: string, message: string) => defHttp.put({ url: Api.stopProcessInstance, params: { processInsId, message } }); -export const queryProcessStatus = (processInsId: string) => defHttp.get({ url: `${Api.queryProcessStatus}/${processInsId}`} ); +export const queryProcessStatus = (processInsId: string) => defHttp.get({ url: `${Api.queryProcessStatus}/${processInsId}`} ); export const selfProcessInstanceList = (params: Recordable) => defHttp.get({ url: Api.selfProcessInstanceList, params }); diff --git a/src/assets/images/workflow/agree.png b/src/assets/images/workflow/agree.png new file mode 100644 index 0000000..d9b0bb5 Binary files /dev/null and b/src/assets/images/workflow/agree.png differ diff --git a/src/assets/images/workflow/deleted.png b/src/assets/images/workflow/deleted.png new file mode 100644 index 0000000..d17b37c Binary files /dev/null and b/src/assets/images/workflow/deleted.png differ diff --git a/src/assets/images/workflow/reject.png b/src/assets/images/workflow/reject.png new file mode 100644 index 0000000..635ac4e Binary files /dev/null and b/src/assets/images/workflow/reject.png differ diff --git a/src/assets/images/workflow/revoke.png b/src/assets/images/workflow/revoke.png new file mode 100644 index 0000000..05c6fb2 Binary files /dev/null and b/src/assets/images/workflow/revoke.png differ diff --git a/src/assets/images/workflow/stop.png b/src/assets/images/workflow/stop.png new file mode 100644 index 0000000..4734d7a Binary files /dev/null and b/src/assets/images/workflow/stop.png differ diff --git a/src/assets/images/workflow/waiting.png b/src/assets/images/workflow/waiting.png new file mode 100644 index 0000000..342ace7 Binary files /dev/null and b/src/assets/images/workflow/waiting.png differ diff --git a/src/views/workflow/task/TaskForm.vue b/src/views/workflow/task/TaskForm.vue index 7ecae4a..443bb0a 100644 --- a/src/views/workflow/task/TaskForm.vue +++ b/src/views/workflow/task/TaskForm.vue @@ -48,7 +48,7 @@ 流转记录 - + diff --git a/src/views/workflow/task/TaskFormView.vue b/src/views/workflow/task/TaskFormView.vue new file mode 100644 index 0000000..ffec904 --- /dev/null +++ b/src/views/workflow/task/TaskFormView.vue @@ -0,0 +1,243 @@ + + + diff --git a/src/views/workflow/task/WorkflowPreviewForm.vue b/src/views/workflow/task/WorkflowPreviewForm.vue index 9e3daf2..c9f9958 100644 --- a/src/views/workflow/task/WorkflowPreviewForm.vue +++ b/src/views/workflow/task/WorkflowPreviewForm.vue @@ -22,6 +22,10 @@ disabled: { type: Boolean as PropType, default: false + }, + readonly: { + type: Boolean as PropType, + default: false } }); @@ -41,8 +45,8 @@ const formDesignProps = { style: { 'min-height': '50px' }, options: {}, - disabled: false, - readonly: false, + disabled: props.disabled, + readonly: props.readonly, value: state.formData, handleValueChange: (formData: Recordable) => formDesignProps.value = state.formData = formData