diff --git a/yudao-ui-admin-vue3/src/views/bpm/processInstance/create.vue b/yudao-ui-admin-vue3/src/views/bpm/processInstance/create.vue new file mode 100644 index 000000000..1bd3ab402 --- /dev/null +++ b/yudao-ui-admin-vue3/src/views/bpm/processInstance/create.vue @@ -0,0 +1,133 @@ + + + + + + + v{{ row.version }} + + + 选择 + + + + + + + + 申请信息【{{ selectProcessInstance.name }}】 + 选择其它流程 + + + + + + + + + + 流程图 + + + + + + + + + + diff --git a/yudao-ui-admin-vue3/src/views/bpm/processInstance/detail.vue b/yudao-ui-admin-vue3/src/views/bpm/processInstance/detail.vue new file mode 100644 index 000000000..6911fb281 --- /dev/null +++ b/yudao-ui-admin-vue3/src/views/bpm/processInstance/detail.vue @@ -0,0 +1,506 @@ + + + + + + 审批任务【{{ item.name }}】 + + + + + {{ processInstance.name }} + + + {{ processInstance.startUser.nickname }} + {{ processInstance.startUser.deptName }} + + + + + + + 通过 + 不通过 + 转办 + 委派 + 退回 + + + + + + + 申请信息【{{ processInstance.name }}】 + + + + + + + + + 点击查看 + + + + + + + + 审批记录 + + + + + + 任务:{{ item.name }} + + + 审批人:{{ item.assigneeUser.nickname }} + {{ item.assigneeUser.deptName }} + + 创建时间: + {{ + parseTime(item.createTime) + }} + 审批时间: + + {{ parseTime(item.endTime) }} + 耗时: + + {{ getDateStar(item.durationInMillis) }} + + + {{ item.reason }} + + + + + + + + + + + + 流程图 + + + + + + + + + + + + + + + + + + + + + diff --git a/yudao-ui-admin-vue3/src/views/bpm/processInstance/index.vue b/yudao-ui-admin-vue3/src/views/bpm/processInstance/index.vue index e71498df0..aa834d531 100644 --- a/yudao-ui-admin-vue3/src/views/bpm/processInstance/index.vue +++ b/yudao-ui-admin-vue3/src/views/bpm/processInstance/index.vue @@ -1,113 +1,110 @@ - - - - - - - - - - - - {{ t('action.add') }} - - - - - - - - - {{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }} - - - - {{ t('action.detail') }} - - - {{ t('action.del') }} - - - - - - - - - - - {{ t('dialog.close') }} - - - diff --git a/yudao-ui-admin-vue3/src/views/bpm/processInstance/process.create.ts b/yudao-ui-admin-vue3/src/views/bpm/processInstance/process.create.ts new file mode 100644 index 000000000..36cdebc54 --- /dev/null +++ b/yudao-ui-admin-vue3/src/views/bpm/processInstance/process.create.ts @@ -0,0 +1,36 @@ +import { reactive } from 'vue' +// import { useI18n } from '@/hooks/web/useI18n' +import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas' +import { DICT_TYPE } from '@/utils/dict' +// const { t } = useI18n() // 国际化 + +// CrudSchema +const crudSchemas = reactive({ + primaryKey: 'id', + primaryType: 'id', + primaryTitle: '流程名称', + action: true, + actionWidth: '200px', + columns: [ + { + title: '流程分类', + field: 'category', + dictType: DICT_TYPE.BPM_MODEL_CATEGORY, + dictClass: 'number' + }, + { + title: '流程版本', + field: 'processDefinition.version', + table: { + slots: { + default: 'version_default' + } + } + }, + { + title: '流程描述', + field: 'description' + } + ] +}) +export const { allSchemas } = useVxeCrudSchemas(crudSchemas) diff --git a/yudao-ui-admin-vue3/src/views/bpm/processInstance/process.data.ts b/yudao-ui-admin-vue3/src/views/bpm/processInstance/process.data.ts index 7be3f1fe7..b399f601a 100644 --- a/yudao-ui-admin-vue3/src/views/bpm/processInstance/process.data.ts +++ b/yudao-ui-admin-vue3/src/views/bpm/processInstance/process.data.ts @@ -1,84 +1,91 @@ -import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas' +import { reactive } from 'vue' +import { useI18n } from '@/hooks/web/useI18n' +import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas' +import { DICT_TYPE } from '@/utils/dict' const { t } = useI18n() // 国际化 // CrudSchema -const crudSchemas = reactive([ - { - label: t('common.index'), - field: 'id', - type: 'index', - form: { - show: false +const crudSchemas = reactive({ + primaryKey: 'id', + primaryType: null, + primaryTitle: '编号', + action: true, + actionWidth: '200px', + columns: [ + { + title: '编号', + field: 'id', + table: { + width: 320 + } }, - detail: { - show: false - } - }, - { - label: '流程名', - field: 'name', - search: { - show: true - } - }, - { - label: '流程分类', - field: 'category', - dictType: DICT_TYPE.BPM_MODEL_CATEGORY, - dictClass: 'number', - search: { - show: true - } - }, - { - label: '当前审批任务', - field: 'tasks' - }, - { - label: t('common.status'), - field: 'status', - dictType: DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS, - dictClass: 'number', - search: { - show: true - } - }, - { - label: '结果', - field: 'result', - dictType: DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT, - dictClass: 'number', - search: { - show: true - } - }, - { - label: '提交时间', - field: 'createTime', - form: { - show: false + { + title: '流程名', + field: 'name', + isSearch: true }, - search: { - show: true - } - }, - { - label: '结束时间', - field: 'endTime', - form: { - show: false - } - }, - { - label: t('table.action'), - field: 'action', - width: '240px', - form: { - show: false + { + title: '所属流程', + field: 'processDefinitionId', + isSearch: true, + isTable: false }, - detail: { - show: false + { + title: '流程分类', + field: 'category', + dictType: DICT_TYPE.BPM_MODEL_CATEGORY, + dictClass: 'number', + isSearch: true + }, + { + title: '当前审批任务', + field: 'tasks', + table: { + width: 100, + slots: { + default: 'tasks_default' + } + } + }, + { + title: t('common.status'), + field: 'status', + dictType: DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS, + dictClass: 'number', + isSearch: true + }, + { + title: '结果', + field: 'result', + dictType: DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT, + dictClass: 'number', + isSearch: true + }, + { + title: '提交时间', + field: 'createTime', + formatter: 'formatDate', + table: { + width: 180 + }, + isForm: false, + isSearch: true, + search: { + show: true, + itemRender: { + name: 'XDataTimePicker' + } + } + }, + { + title: '结束时间', + field: 'endTime', + formatter: 'formatDate', + table: { + width: 180 + }, + isForm: false } - } -]) -export const { allSchemas } = useCrudSchemas(crudSchemas) + ] +}) +export const { allSchemas } = useVxeCrudSchemas(crudSchemas) diff --git a/yudao-ui-admin-vue3/src/views/bpm/processInstance/process.detail.ts b/yudao-ui-admin-vue3/src/views/bpm/processInstance/process.detail.ts new file mode 100644 index 000000000..36cdebc54 --- /dev/null +++ b/yudao-ui-admin-vue3/src/views/bpm/processInstance/process.detail.ts @@ -0,0 +1,36 @@ +import { reactive } from 'vue' +// import { useI18n } from '@/hooks/web/useI18n' +import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas' +import { DICT_TYPE } from '@/utils/dict' +// const { t } = useI18n() // 国际化 + +// CrudSchema +const crudSchemas = reactive({ + primaryKey: 'id', + primaryType: 'id', + primaryTitle: '流程名称', + action: true, + actionWidth: '200px', + columns: [ + { + title: '流程分类', + field: 'category', + dictType: DICT_TYPE.BPM_MODEL_CATEGORY, + dictClass: 'number' + }, + { + title: '流程版本', + field: 'processDefinition.version', + table: { + slots: { + default: 'version_default' + } + } + }, + { + title: '流程描述', + field: 'description' + } + ] +}) +export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
任务:{{ item.name }}
+ {{ item.reason }} +