From f74067023d104865188a491a9b5ffa6586428ceb Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Wed, 19 Apr 2023 17:47:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=A1=A8=E5=8D=95=EF=BC=9A?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=BC=82=E6=AD=A5=E7=BB=84=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=8A=A8=E6=80=81=E5=8A=A0=E8=BD=BD=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E8=A1=A8=E5=8D=95=E6=8C=87=E5=AE=9A=E7=9A=84=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E8=A1=A8=E5=8D=95=E7=9A=84=E7=BB=84=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=98=BE=E7=A4=BA=E5=88=B0=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=B8=8D=E5=86=8D=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/routerHelper.ts                     | 18 ++++-
 src/views/bpm/oa/leave/detail.vue             |  5 +-
 .../bpm/processInstance/detail/index.vue      | 67 +++++++++----------
 3 files changed, 51 insertions(+), 39 deletions(-)

diff --git a/src/utils/routerHelper.ts b/src/utils/routerHelper.ts
index af6a9c3c..a6825653 100644
--- a/src/utils/routerHelper.ts
+++ b/src/utils/routerHelper.ts
@@ -1,10 +1,22 @@
+import type { RouteLocationNormalized, Router, RouteRecordNormalized } from 'vue-router'
 import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router'
-import type { Router, RouteLocationNormalized, RouteRecordNormalized } from 'vue-router'
 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}')
-
+/**
+ * 注册一个异步组件
+ * @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 */
 export const Layout = () => import('@/layout/Layout.vue')
 
diff --git a/src/views/bpm/oa/leave/detail.vue b/src/views/bpm/oa/leave/detail.vue
index 2ce8a39d..a1b646a1 100644
--- a/src/views/bpm/oa/leave/detail.vue
+++ b/src/views/bpm/oa/leave/detail.vue
@@ -1,6 +1,6 @@
 <template>
   <ContentWrap>
-    <el-descriptions border :column="1">
+    <el-descriptions :column="1" border>
       <el-descriptions-item label="请假类型">
         <dict-tag :type="DICT_TYPE.BPM_OA_LEAVE_TYPE" :value="detailData.type" />
       </el-descriptions-item>
@@ -21,6 +21,7 @@ import { DICT_TYPE } from '@/utils/dict'
 import { formatDate } from '@/utils/formatTime'
 import { propTypes } from '@/utils/propTypes'
 import * as LeaveApi from '@/api/bpm/leave'
+
 const { query } = useRoute() // 查询参数
 
 const props = defineProps({
@@ -34,7 +35,7 @@ const queryId = query.id as unknown as number // 从 URL 传递过来的 id 编
 const getInfo = async () => {
   detailLoading.value = true
   try {
-    detailData.value = await LeaveApi.getLeave(queryId || props.id)
+    detailData.value = await LeaveApi.getLeave(props.id || queryId)
   } finally {
     detailLoading.value = false
   }
diff --git a/src/views/bpm/processInstance/detail/index.vue b/src/views/bpm/processInstance/detail/index.vue
index 62fe3ab2..eb01e6e0 100644
--- a/src/views/bpm/processInstance/detail/index.vue
+++ b/src/views/bpm/processInstance/detail/index.vue
@@ -2,81 +2,78 @@
   <ContentWrap>
     <!-- 审批信息 -->
     <el-card
-      class="box-card"
-      v-loading="processInstanceLoading"
       v-for="(item, index) in runningTasks"
       :key="index"
+      v-loading="processInstanceLoading"
+      class="box-card"
     >
       <template #header>
         <span class="el-icon-picture-outline">审批任务【{{ item.name }}】</span>
       </template>
-      <el-col :span="16" :offset="6">
+      <el-col :offset="6" :span="16">
         <el-form
           :ref="'form' + index"
           :model="auditForms[index]"
           :rules="auditRule"
           label-width="100px"
         >
-          <el-form-item label="流程名" v-if="processInstance && processInstance.name">
+          <el-form-item v-if="processInstance && processInstance.name" label="流程名">
             {{ processInstance.name }}
           </el-form-item>
-          <el-form-item label="流程发起人" v-if="processInstance && processInstance.startUser">
+          <el-form-item v-if="processInstance && processInstance.startUser" label="流程发起人">
             {{ 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 label="审批建议" prop="reason">
             <el-input
-              type="textarea"
               v-model="auditForms[index].reason"
               placeholder="请输入审批建议"
+              type="textarea"
             />
           </el-form-item>
         </el-form>
         <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
           <el-button type="success" @click="handleAudit(item, true)">
-            <Icon icon="ep:select" /> 通过
+            <Icon icon="ep:select" />
+            通过
           </el-button>
           <el-button type="danger" @click="handleAudit(item, false)">
-            <Icon icon="ep:close" /> 不通过
+            <Icon icon="ep:close" />
+            不通过
           </el-button>
           <el-button type="primary" @click="openTaskUpdateAssigneeForm(item.id)">
-            <Icon icon="ep:edit" /> 转办
+            <Icon icon="ep:edit" />
+            转办
           </el-button>
           <el-button type="primary" @click="handleDelegate(item)">
-            <Icon icon="ep:position" /> 委派
+            <Icon icon="ep:position" />
+            委派
           </el-button>
           <el-button type="warning" @click="handleBack(item)">
-            <Icon icon="ep:back" /> 回退
+            <Icon icon="ep:back" />
+            回退
           </el-button>
         </div>
       </el-col>
     </el-card>
 
     <!-- 申请信息 -->
-    <el-card class="box-card" v-loading="processInstanceLoading">
+    <el-card v-loading="processInstanceLoading" class="box-card">
       <template #header>
         <span class="el-icon-document">申请信息【{{ processInstance.name }}】</span>
       </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
           ref="fApi"
-          :rule="detailForm.rule"
-          :option="detailForm.option"
           v-model="detailForm.value"
+          :option="detailForm.option"
+          :rule="detailForm.rule"
         />
       </el-col>
-      <!-- 情况二：流程表单 -->
+      <!-- 情况二：业务表单 -->
       <div v-if="processInstance?.processDefinition?.formType === 20">
-        <router-link
-          :to="
-            processInstance.processDefinition.formCustomViewPath +
-            '?id=' +
-            processInstance.businessKey
-          "
-        >
-          <el-button type="primary"><Icon icon="ep:view" /> 点击查看</el-button>
-        </router-link>
+        <autoComponent :id="processInstance.businessKey" />
       </div>
     </el-card>
 
@@ -85,18 +82,18 @@
 
     <!-- 高亮流程图 -->
     <ProcessInstanceBpmnViewer
-      :id="id"
-      :process-instance="processInstance"
-      :loading="processInstanceLoading"
-      :tasks="tasks"
+      :id="`${id}`"
       :bpmn-xml="bpmnXML"
+      :loading="processInstanceLoading"
+      :process-instance="processInstance"
+      :tasks="tasks"
     />
 
     <!-- 弹窗：转派审批人 -->
     <TaskUpdateAssigneeForm ref="taskUpdateAssigneeFormRef" @success="getDetail" />
   </ContentWrap>
 </template>
-<script setup lang="ts" name="BpmProcessInstanceDetail">
+<script lang="ts" name="BpmProcessInstanceDetail" setup>
 import { useUserStore } from '@/store/modules/user'
 import { setConfAndFields2 } from '@/utils/formCreate'
 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 ProcessInstanceBpmnViewer from './ProcessInstanceBpmnViewer.vue'
 import ProcessInstanceTaskList from './ProcessInstanceTaskList.vue'
+import { registerComponent } from '@/utils/routerHelper'
+
 const { query } = useRoute() // 查询参数
 const message = useMessage() // 消息弹窗
 const { proxy } = getCurrentInstance() as any
@@ -184,7 +183,7 @@ const getDetail = () => {
   // 2. 获得流程任务列表（审批记录）
   getTaskList()
 }
-
+const autoComponent = ref(null) // 异步组件
 /** 加载流程实例 */
 const getProcessInstance = async () => {
   try {
@@ -195,7 +194,7 @@ const getProcessInstance = async () => {
       return
     }
     processInstance.value = data
-
+    autoComponent.value = registerComponent(data.processDefinition.formCustomViewPath)
     // 设置表单信息
     const processDefinition = data.processDefinition
     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 {
     processInstanceLoading.value = false
   }