From bc33acfad427f4b3aab708e6501af5c7984877a1 Mon Sep 17 00:00:00 2001
From: lizhixian <18210040298@163.com>
Date: Wed, 12 Feb 2025 09:45:29 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=8F=91=E5=B8=83=E6=96=B0?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=B5=81=E7=A8=8B=E6=97=B6=EF=BC=8C=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=8D=95=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/bpm/model/index.ts                     |  6 +++---
 src/views/bpm/model/CategoryDraggableModel.vue |  5 +----
 src/views/bpm/model/form/index.vue             | 16 +++-------------
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/api/bpm/model/index.ts b/src/api/bpm/model/index.ts
index f77dec46..5590e1c4 100644
--- a/src/api/bpm/model/index.ts
+++ b/src/api/bpm/model/index.ts
@@ -78,11 +78,11 @@ export const cleanModel = async (id: number) => {
 }
 /**
  * 查询当前流程实例下是否存在正在进行中的单据
- * @param processDefinitionId  流程定义id
+ * @param modelId  模型定义id
  * @returns true/false
  */
-export const getProcessInstance = async (processDefinitionId: string) => {
+export const getProcessInstance = async (modelId: string) => {
   return await request.get({
-    url: '/bpm/task/manager-list?processDefinitionId=' + processDefinitionId
+    url: '/bpm/task/manager-list?modelId=' + modelId
   })
 }
diff --git a/src/views/bpm/model/CategoryDraggableModel.vue b/src/views/bpm/model/CategoryDraggableModel.vue
index cf1988a3..ed99b712 100644
--- a/src/views/bpm/model/CategoryDraggableModel.vue
+++ b/src/views/bpm/model/CategoryDraggableModel.vue
@@ -445,13 +445,10 @@ const handleChangeState = async (row: any) => {
 /** 发布流程 */
 const handleDeploy = async (row: any) => {
   try {
-    // 发布的二次确认
-    await message.confirm('是否发布该流程！！')
     //校验当前版本的流程下是否存在正在进行中的单据
     const res = await ModelApi.getProcessInstance(row.id)
     if (res) {
-      message.error('当前版本下存在正在进行中的单据，请先结束单据后再发布')
-      return
+      await message.confirm('流程下存在进行中的单据，是否确认发布该流程？')
     }
     // 发起部署
     await ModelApi.deployModel(row.id)
diff --git a/src/views/bpm/model/form/index.vue b/src/views/bpm/model/form/index.vue
index b997baec..8787ed0c 100644
--- a/src/views/bpm/model/form/index.vue
+++ b/src/views/bpm/model/form/index.vue
@@ -179,8 +179,6 @@ const userList = ref<UserApi.UserVO[]>([])
 
 /** 初始化数据 */
 const initData = async () => {
-  console.log(route.params);
-  
   const modelId = route.params.id as string
   if (modelId) {
     // 修改场景
@@ -297,7 +295,7 @@ const handleSave = async () => {
         // 跳转到编辑页面
         await router.push({
           name: 'BpmModelUpdate',
-          params: { id: formData.value.id}
+          params: { id: formData.value.id }
         })
       } catch {
         // 先删除当前页签
@@ -314,21 +312,16 @@ const handleSave = async () => {
 
 /** 发布操作 */
 const handleDeploy = async () => {
-  console.log(route.params);
-  
   try {
     // 修改场景下直接发布，新增场景下需要先确认
     if (!formData.value.id) {
       await message.confirm('是否确认发布该流程？')
     }
-
     //校验当前版本的流程下是否存在正在进行中的单据
     const res = await ModelApi.getProcessInstance(formData.value.id)
     if (res) {
-      message.error('当前版本下存在正在进行中的单据，请先结束单据后再发布')
-      return
+      await message.confirm('流程下存在进行中的单据，是否确认发布该流程？')
     }
-
     // 校验所有步骤
     await validateAllSteps()
 
@@ -350,10 +343,7 @@ const handleDeploy = async () => {
     message.success('发布成功')
     // 返回列表页
     await router.push({ name: 'BpmModel' })
-  } catch (error: any) {
-    console.error('发布失败:', error)
-    message.warning(error.message || '发布失败')
-  }
+  } catch (error: any) {}
 }
 
 /** 步骤切换处理 */