From 8245f8a369447fdcaa70de78916f2839cc466fec Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Thu, 9 Mar 2023 00:23:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E4=B8=9A=E5=8A=A1=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E5=81=9A=E4=B8=BA=E5=8A=A8=E6=80=81=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

---
 yudao-ui-admin/src/views/bpm/oa/leave/detail.vue | 16 +++++++++++-----
 .../src/views/bpm/processInstance/detail.vue     | 12 ++++++++----
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/yudao-ui-admin/src/views/bpm/oa/leave/detail.vue b/yudao-ui-admin/src/views/bpm/oa/leave/detail.vue
index 1e1e464fa..40830424e 100644
--- a/yudao-ui-admin/src/views/bpm/oa/leave/detail.vue
+++ b/yudao-ui-admin/src/views/bpm/oa/leave/detail.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!-- 对话框(添加 / 修改) -->
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" label-width="100px">
         <el-form-item label="开始时间：" prop="startTime"> {{parseTime(form.startTime, '{y}-{m}-{d}')}} </el-form-item>
         <el-form-item label="结束时间：" prop="endTime"> {{parseTime(form.endTime, '{y}-{m}-{d}')}} </el-form-item>
         <el-form-item label="请假类型：" prop="type">
@@ -19,9 +19,15 @@ export default {
   name: "LeaveDetail",
   components: {
   },
+  props: {
+    id: {
+      type: [String, Number],
+      default: undefined
+    },
+  },
   data() {
     return {
-      id: undefined, // 请假编号
+      leaveId: undefined, // 请假编号
       // 表单参数
       form: {
         startTime: undefined,
@@ -34,8 +40,8 @@ export default {
     };
   },
   created() {
-    this.id = this.$route.query.id;
-    if (!this.id) {
+    this.leaveId = this.id || this.$route.query.id;
+    if (!this.leaveId) {
       this.$message.error('未传递 id 参数，无法查看 OA 请假信息');
       return;
     }
@@ -44,7 +50,7 @@ export default {
   methods: {
     /** 获得请假信息 */
     getDetail() {
-      getLeave(this.id).then(response => {
+      getLeave(this.leaveId).then(response => {
         this.form = response.data;
       });
     },
diff --git a/yudao-ui-admin/src/views/bpm/processInstance/detail.vue b/yudao-ui-admin/src/views/bpm/processInstance/detail.vue
index a1f9f6908..7ecc53438 100644
--- a/yudao-ui-admin/src/views/bpm/processInstance/detail.vue
+++ b/yudao-ui-admin/src/views/bpm/processInstance/detail.vue
@@ -39,10 +39,7 @@
         </div>
       </el-col>
       <div v-if="this.processInstance.processDefinition && this.processInstance.processDefinition.formType === 20">
-        <router-link :to="this.processInstance.processDefinition.formCustomViewPath + '?id='
-                          + this.processInstance.businessKey">
-          <el-button type="primary">点击查看</el-button>
-        </router-link>
+        <async-biz-form-component :id="this.processInstance.businessKey"></async-biz-form-component>
       </div>
     </el-card>
 
@@ -115,6 +112,7 @@ import {approveTask, getTaskListByProcessInstanceId, rejectTask, updateTaskAssig
 import {getDate} from "@/utils/dateUtils";
 import {listSimpleUsers} from "@/api/system/user";
 import {getActivityList} from "@/api/bpm/activity";
+import Vue from "vue";
 
 // 流程实例的详情页，可用于审批
 export default {
@@ -193,6 +191,12 @@ export default {
         // 设置流程信息
         this.processInstance = response.data;
 
+        //将业务表单，注册为动态组件
+        const path = this.processInstance.processDefinition.formCustomViewPath;
+        Vue.component("async-biz-form-component", function(resolve) {
+          require([`@/views${path}`], resolve);
+        });
+
         // 设置表单信息
         if (this.processInstance.processDefinition.formType === 10) {
           this.detailForm = {