From e12c17360a8a49f39ca0ff9c35a95b6d683ef403 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 22 Jan 2022 20:54:23 +0800
Subject: [PATCH] =?UTF-8?q?bpm=20=E7=9A=84=E5=AE=9E=E4=BE=8B=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E7=95=8C=E9=9D=A2=EF=BC=8C=E6=8E=A5=E5=85=A5=20busine?=
 =?UTF-8?q?ssKey?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/oa/BpmOALeaveController.http   |  2 +-
 .../vo/instance/BpmProcessInstanceRespVO.java |  3 ++
 .../src/views/bpm/processInstance/detail.vue  | 37 ++++++++++++-------
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/BpmOALeaveController.http b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/BpmOALeaveController.http
index 2b4b9b7a..96bbf964 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/BpmOALeaveController.http
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/BpmOALeaveController.http
@@ -6,7 +6,7 @@ Authorization: Bearer {{token}}
 
 {
   "startTime": "2022-03-01",
-  "endTime": "2022-03-03",
+  "endTime": "2022-03-05",
   "type": 1,
   "reason": "我要请假啦啦啦！"
 }
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/instance/BpmProcessInstanceRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/instance/BpmProcessInstanceRespVO.java
index 6d5ae687..de6999c6 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/instance/BpmProcessInstanceRespVO.java
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/instance/BpmProcessInstanceRespVO.java
@@ -36,6 +36,9 @@ public class BpmProcessInstanceRespVO {
     @ApiModelProperty(value = "提交的表单值", required = true)
     private Map<String, Object> formVariables;
 
+    @ApiModelProperty(value = "业务的唯一标识", example = "1", notes = "例如说，请假申请的编号")
+    private String businessKey;
+
     /**
      * 发起流程的用户
      */
diff --git a/yudao-admin-ui/src/views/bpm/processInstance/detail.vue b/yudao-admin-ui/src/views/bpm/processInstance/detail.vue
index 587b004c..5716de8e 100644
--- a/yudao-admin-ui/src/views/bpm/processInstance/detail.vue
+++ b/yudao-admin-ui/src/views/bpm/processInstance/detail.vue
@@ -32,11 +32,18 @@
       <div slot="header" class="clearfix">
         <span class="el-icon-document">申请信息【{{ processInstance.name }}】</span>
       </div>
-      <el-col :span="16" :offset="6">
-        <div>
+      <el-col v-if="this.processInstance.processDefinition && this.processInstance.processDefinition.formType === 10"
+              :span="16" :offset="6">
+        <div >
           <parser :key="new Date().getTime()" :form-conf="detailForm" @submit="submitForm" />
         </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>
+      </div>
     </el-card>
     <el-card class="box-card" v-loading="tasksLoad">
       <div slot="header" class="clearfix">
@@ -188,19 +195,21 @@ export default {
         this.processInstance = response.data;
 
         // 设置表单信息
-        this.detailForm = {
-          ...JSON.parse(this.processInstance.processDefinition.formConf),
-          disabled: true, // 表单禁用
-          formBtns: false, // 按钮隐藏
-          fields: decodeFields(this.processInstance.processDefinition.formFields)
-        }
-        // 设置表单的值
-        this.detailForm.fields.forEach(item => {
-          const val = this.processInstance.formVariables[item.__vModel__]
-          if (val) {
-            item.__config__.defaultValue = val
+        if (this.processInstance.processDefinition.formType === 10) {
+          this.detailForm = {
+            ...JSON.parse(this.processInstance.processDefinition.formConf),
+            disabled: true, // 表单禁用
+            formBtns: false, // 按钮隐藏
+            fields: decodeFields(this.processInstance.processDefinition.formFields)
           }
-        });
+          // 设置表单的值
+          this.detailForm.fields.forEach(item => {
+            const val = this.processInstance.formVariables[item.__vModel__]
+            if (val) {
+              item.__config__.defaultValue = val
+            }
+          });
+        }
 
         // 加载流程图
         getProcessDefinitionBpmnXML(this.processInstance.processDefinition.id).then(response => {