流程表单:使用异步组件的方式动态加载业务表单指定的查看表单的组件,直接显示到审批页面,不再需要点击查看

This commit is contained in:
puhui999 2023-04-19 17:47:26 +08:00
parent 604b8867ce
commit f74067023d
3 changed files with 51 additions and 39 deletions

View File

@ -1,10 +1,22 @@
import type { RouteLocationNormalized, Router, RouteRecordNormalized } from 'vue-router'
import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router' import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router'
import type { Router, RouteLocationNormalized, RouteRecordNormalized } from 'vue-router'
import { isUrl } from '@/utils/is' import { isUrl } from '@/utils/is'
import { omit, cloneDeep } from 'lodash-es' import { cloneDeep, omit } from 'lodash-es'
const modules = import.meta.glob('../views/**/*.{vue,tsx}') const modules = import.meta.glob('../views/**/*.{vue,tsx}')
/**
*
* @param componentPath :/bpm/oa/leave/detail
*/
export const registerComponent = (componentPath: string) => {
for (const item in modules) {
if (item.includes(componentPath)) {
// 使用异步组件的方式来动态加载组件
// @ts-ignore
return defineAsyncComponent(modules[item])
}
}
}
/* Layout */ /* Layout */
export const Layout = () => import('@/layout/Layout.vue') export const Layout = () => import('@/layout/Layout.vue')

View File

@ -1,6 +1,6 @@
<template> <template>
<ContentWrap> <ContentWrap>
<el-descriptions border :column="1"> <el-descriptions :column="1" border>
<el-descriptions-item label="请假类型"> <el-descriptions-item label="请假类型">
<dict-tag :type="DICT_TYPE.BPM_OA_LEAVE_TYPE" :value="detailData.type" /> <dict-tag :type="DICT_TYPE.BPM_OA_LEAVE_TYPE" :value="detailData.type" />
</el-descriptions-item> </el-descriptions-item>
@ -21,6 +21,7 @@ import { DICT_TYPE } from '@/utils/dict'
import { formatDate } from '@/utils/formatTime' import { formatDate } from '@/utils/formatTime'
import { propTypes } from '@/utils/propTypes' import { propTypes } from '@/utils/propTypes'
import * as LeaveApi from '@/api/bpm/leave' import * as LeaveApi from '@/api/bpm/leave'
const { query } = useRoute() // const { query } = useRoute() //
const props = defineProps({ const props = defineProps({
@ -34,7 +35,7 @@ const queryId = query.id as unknown as number // 从 URL 传递过来的 id 编
const getInfo = async () => { const getInfo = async () => {
detailLoading.value = true detailLoading.value = true
try { try {
detailData.value = await LeaveApi.getLeave(queryId || props.id) detailData.value = await LeaveApi.getLeave(props.id || queryId)
} finally { } finally {
detailLoading.value = false detailLoading.value = false
} }

View File

@ -2,81 +2,78 @@
<ContentWrap> <ContentWrap>
<!-- 审批信息 --> <!-- 审批信息 -->
<el-card <el-card
class="box-card"
v-loading="processInstanceLoading"
v-for="(item, index) in runningTasks" v-for="(item, index) in runningTasks"
:key="index" :key="index"
v-loading="processInstanceLoading"
class="box-card"
> >
<template #header> <template #header>
<span class="el-icon-picture-outline">审批任务{{ item.name }}</span> <span class="el-icon-picture-outline">审批任务{{ item.name }}</span>
</template> </template>
<el-col :span="16" :offset="6"> <el-col :offset="6" :span="16">
<el-form <el-form
:ref="'form' + index" :ref="'form' + index"
:model="auditForms[index]" :model="auditForms[index]"
:rules="auditRule" :rules="auditRule"
label-width="100px" label-width="100px"
> >
<el-form-item label="流程名" v-if="processInstance && processInstance.name"> <el-form-item v-if="processInstance && processInstance.name" label="流程名">
{{ processInstance.name }} {{ processInstance.name }}
</el-form-item> </el-form-item>
<el-form-item label="流程发起人" v-if="processInstance && processInstance.startUser"> <el-form-item v-if="processInstance && processInstance.startUser" label="流程发起人">
{{ processInstance.startUser.nickname }} {{ processInstance.startUser.nickname }}
<el-tag type="info" size="small">{{ processInstance.startUser.deptName }}</el-tag> <el-tag size="small" type="info">{{ processInstance.startUser.deptName }}</el-tag>
</el-form-item> </el-form-item>
<el-form-item label="审批建议" prop="reason"> <el-form-item label="审批建议" prop="reason">
<el-input <el-input
type="textarea"
v-model="auditForms[index].reason" v-model="auditForms[index].reason"
placeholder="请输入审批建议" placeholder="请输入审批建议"
type="textarea"
/> />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px"> <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
<el-button type="success" @click="handleAudit(item, true)"> <el-button type="success" @click="handleAudit(item, true)">
<Icon icon="ep:select" /> 通过 <Icon icon="ep:select" />
通过
</el-button> </el-button>
<el-button type="danger" @click="handleAudit(item, false)"> <el-button type="danger" @click="handleAudit(item, false)">
<Icon icon="ep:close" /> 不通过 <Icon icon="ep:close" />
不通过
</el-button> </el-button>
<el-button type="primary" @click="openTaskUpdateAssigneeForm(item.id)"> <el-button type="primary" @click="openTaskUpdateAssigneeForm(item.id)">
<Icon icon="ep:edit" /> 转办 <Icon icon="ep:edit" />
转办
</el-button> </el-button>
<el-button type="primary" @click="handleDelegate(item)"> <el-button type="primary" @click="handleDelegate(item)">
<Icon icon="ep:position" /> 委派 <Icon icon="ep:position" />
委派
</el-button> </el-button>
<el-button type="warning" @click="handleBack(item)"> <el-button type="warning" @click="handleBack(item)">
<Icon icon="ep:back" /> 回退 <Icon icon="ep:back" />
回退
</el-button> </el-button>
</div> </div>
</el-col> </el-col>
</el-card> </el-card>
<!-- 申请信息 --> <!-- 申请信息 -->
<el-card class="box-card" v-loading="processInstanceLoading"> <el-card v-loading="processInstanceLoading" class="box-card">
<template #header> <template #header>
<span class="el-icon-document">申请信息{{ processInstance.name }}</span> <span class="el-icon-document">申请信息{{ processInstance.name }}</span>
</template> </template>
<!-- 情况一流程表单 --> <!-- 情况一流程表单 -->
<el-col v-if="processInstance?.processDefinition?.formType === 10" :span="16" :offset="6"> <el-col v-if="processInstance?.processDefinition?.formType === 10" :offset="6" :span="16">
<form-create <form-create
ref="fApi" ref="fApi"
:rule="detailForm.rule"
:option="detailForm.option"
v-model="detailForm.value" v-model="detailForm.value"
:option="detailForm.option"
:rule="detailForm.rule"
/> />
</el-col> </el-col>
<!-- 情况二流程表单 --> <!-- 情况二业务表单 -->
<div v-if="processInstance?.processDefinition?.formType === 20"> <div v-if="processInstance?.processDefinition?.formType === 20">
<router-link <autoComponent :id="processInstance.businessKey" />
:to="
processInstance.processDefinition.formCustomViewPath +
'?id=' +
processInstance.businessKey
"
>
<el-button type="primary"><Icon icon="ep:view" /> 点击查看</el-button>
</router-link>
</div> </div>
</el-card> </el-card>
@ -85,18 +82,18 @@
<!-- 高亮流程图 --> <!-- 高亮流程图 -->
<ProcessInstanceBpmnViewer <ProcessInstanceBpmnViewer
:id="id" :id="`${id}`"
:process-instance="processInstance"
:loading="processInstanceLoading"
:tasks="tasks"
:bpmn-xml="bpmnXML" :bpmn-xml="bpmnXML"
:loading="processInstanceLoading"
:process-instance="processInstance"
:tasks="tasks"
/> />
<!-- 弹窗转派审批人 --> <!-- 弹窗转派审批人 -->
<TaskUpdateAssigneeForm ref="taskUpdateAssigneeFormRef" @success="getDetail" /> <TaskUpdateAssigneeForm ref="taskUpdateAssigneeFormRef" @success="getDetail" />
</ContentWrap> </ContentWrap>
</template> </template>
<script setup lang="ts" name="BpmProcessInstanceDetail"> <script lang="ts" name="BpmProcessInstanceDetail" setup>
import { useUserStore } from '@/store/modules/user' import { useUserStore } from '@/store/modules/user'
import { setConfAndFields2 } from '@/utils/formCreate' import { setConfAndFields2 } from '@/utils/formCreate'
import type { ApiAttrs } from '@form-create/element-ui/types/config' import type { ApiAttrs } from '@form-create/element-ui/types/config'
@ -106,6 +103,8 @@ import * as TaskApi from '@/api/bpm/task'
import TaskUpdateAssigneeForm from './TaskUpdateAssigneeForm.vue' import TaskUpdateAssigneeForm from './TaskUpdateAssigneeForm.vue'
import ProcessInstanceBpmnViewer from './ProcessInstanceBpmnViewer.vue' import ProcessInstanceBpmnViewer from './ProcessInstanceBpmnViewer.vue'
import ProcessInstanceTaskList from './ProcessInstanceTaskList.vue' import ProcessInstanceTaskList from './ProcessInstanceTaskList.vue'
import { registerComponent } from '@/utils/routerHelper'
const { query } = useRoute() // const { query } = useRoute() //
const message = useMessage() // const message = useMessage() //
const { proxy } = getCurrentInstance() as any const { proxy } = getCurrentInstance() as any
@ -184,7 +183,7 @@ const getDetail = () => {
// 2. // 2.
getTaskList() getTaskList()
} }
const autoComponent = ref(null) //
/** 加载流程实例 */ /** 加载流程实例 */
const getProcessInstance = async () => { const getProcessInstance = async () => {
try { try {
@ -195,7 +194,7 @@ const getProcessInstance = async () => {
return return
} }
processInstance.value = data processInstance.value = data
autoComponent.value = registerComponent(data.processDefinition.formCustomViewPath)
// //
const processDefinition = data.processDefinition const processDefinition = data.processDefinition
if (processDefinition.formType === 10) { if (processDefinition.formType === 10) {
@ -213,7 +212,7 @@ const getProcessInstance = async () => {
} }
// //
bpmnXML.value = await DefinitionApi.getProcessDefinitionBpmnXML(processDefinition.id) bpmnXML.value = await DefinitionApi.getProcessDefinitionBpmnXML(processDefinition.id as number)
} finally { } finally {
processInstanceLoading.value = false processInstanceLoading.value = false
} }