From b0a97c9f942ba89c5329c458101e6e76f32b8f98 Mon Sep 17 00:00:00 2001
From: Pancaihua <75729660@qq.com>
Date: Mon, 18 Nov 2024 21:57:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=89=E4=B8=80=E4=B8=AA=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bpm/knows/knowledge/KnowledgeCreate.vue |  2 +-
 src/views/bpm/knows/knowledge/KnowledgeForm.vue   |  2 +-
 src/views/bpm/processInstance/detail/index.vue    | 12 ++++++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/views/bpm/knows/knowledge/KnowledgeCreate.vue b/src/views/bpm/knows/knowledge/KnowledgeCreate.vue
index c2bb762..4997be5 100644
--- a/src/views/bpm/knows/knowledge/KnowledgeCreate.vue
+++ b/src/views/bpm/knows/knowledge/KnowledgeCreate.vue
@@ -133,7 +133,7 @@ const getUserInfo = async () => {
 }
 //flow begin++++++++++++++++++++
 // 指定审批人
-const processDefineKey = 'pch-qjgl-001' // 流程定义 Key
+const processDefineKey = 'pch-test-001' // 流程定义 Key
 const startUserSelectTasks = ref([]) // 发起人需要选择审批人的用户任务列表
 const startUserSelectAssignees = ref({}) // 发起人选择审批人的数据
 const startUserSelectAssigneesFormRef = ref() // 发起人选择审批人的表单 Ref
diff --git a/src/views/bpm/knows/knowledge/KnowledgeForm.vue b/src/views/bpm/knows/knowledge/KnowledgeForm.vue
index 8fffe3d..efefa45 100644
--- a/src/views/bpm/knows/knowledge/KnowledgeForm.vue
+++ b/src/views/bpm/knows/knowledge/KnowledgeForm.vue
@@ -319,7 +319,7 @@ const star = async () => {
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 //flow begin++++++++++++++++++++
 // 指定审批人
-const processDefineKey = 'pch-qjgl-001' // 流程定义 Key
+const processDefineKey = 'pch-test-001' // 流程定义 Key
 const startUserSelectTasks = ref([]) // 发起人需要选择审批人的用户任务列表
 const startUserSelectAssignees = ref({}) // 发起人选择审批人的数据
 const startUserSelectAssigneesFormRef = ref() // 发起人选择审批人的表单 Ref
diff --git a/src/views/bpm/processInstance/detail/index.vue b/src/views/bpm/processInstance/detail/index.vue
index 59ba114..59861cc 100644
--- a/src/views/bpm/processInstance/detail/index.vue
+++ b/src/views/bpm/processInstance/detail/index.vue
@@ -278,15 +278,17 @@ const BusinessFormComponent = ref(null) // 异步组件
 const getProcessInstance = async () => {
   try {
     processInstanceLoading.value = true
+    console.log(id,"getProcessInstance_id")
     const data = await ProcessInstanceApi.getProcessInstance(id)
     if (!data) {
       message.error('查询不到流程信息！')
       return
     }
     processInstance.value = data
-
+    console.log(data,"processInstance_data")
     // 设置表单信息
     const processDefinition = data.processDefinition
+    console.log(processDefinition.formType,"processDefinition.formType")
     if (processDefinition.formType === 10) {
       setConfAndFields2(
         detailForm,
@@ -301,7 +303,13 @@ const getProcessInstance = async () => {
       })
     } else {
       // 注意：data.processDefinition.formCustomViewPath 是组件的全路径，例如说：/crm/contract/detail/index.vue
-      BusinessFormComponent.value = registerComponent(data.processDefinition.formCustomViewPath)
+      //console.log(data.processDefinition.formCustomViewPath,"formCustomViewPath")
+      if ( data.processDefinition.formCustomViewPath == "") {
+        const process_key = data.processDefinition.key
+        console.log(process_key,"process_key")
+      } else {
+        BusinessFormComponent.value = registerComponent(data.processDefinition.formCustomViewPath)
+      }
     }
 
     // 加载流程图