Skip to content

Commit bc33acf

Browse files
committed
feat:发布新版本流程时,校验是否存在进行中的单据
1 parent c039696 commit bc33acf

File tree

3 files changed

+7
-20
lines changed

3 files changed

+7
-20
lines changed

src/api/bpm/model/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ export const cleanModel = async (id: number) => {
7878
}
7979
/**
8080
* 查询当前流程实例下是否存在正在进行中的单据
81-
* @param processDefinitionId 流程定义id
81+
* @param modelId 模型定义id
8282
* @returns true/false
8383
*/
84-
export const getProcessInstance = async (processDefinitionId: string) => {
84+
export const getProcessInstance = async (modelId: string) => {
8585
return await request.get({
86-
url: '/bpm/task/manager-list?processDefinitionId=' + processDefinitionId
86+
url: '/bpm/task/manager-list?modelId=' + modelId
8787
})
8888
}

src/views/bpm/model/CategoryDraggableModel.vue

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -445,13 +445,10 @@ const handleChangeState = async (row: any) => {
445445
/** 发布流程 */
446446
const handleDeploy = async (row: any) => {
447447
try {
448-
// 发布的二次确认
449-
await message.confirm('是否发布该流程!!')
450448
//校验当前版本的流程下是否存在正在进行中的单据
451449
const res = await ModelApi.getProcessInstance(row.id)
452450
if (res) {
453-
message.error('当前版本下存在正在进行中的单据,请先结束单据后再发布')
454-
return
451+
await message.confirm('流程下存在进行中的单据,是否确认发布该流程?')
455452
}
456453
// 发起部署
457454
await ModelApi.deployModel(row.id)

src/views/bpm/model/form/index.vue

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,6 @@ const userList = ref<UserApi.UserVO[]>([])
179179
180180
/** 初始化数据 */
181181
const initData = async () => {
182-
console.log(route.params);
183-
184182
const modelId = route.params.id as string
185183
if (modelId) {
186184
// 修改场景
@@ -297,7 +295,7 @@ const handleSave = async () => {
297295
// 跳转到编辑页面
298296
await router.push({
299297
name: 'BpmModelUpdate',
300-
params: { id: formData.value.id}
298+
params: { id: formData.value.id }
301299
})
302300
} catch {
303301
// 先删除当前页签
@@ -314,21 +312,16 @@ const handleSave = async () => {
314312
315313
/** 发布操作 */
316314
const handleDeploy = async () => {
317-
console.log(route.params);
318-
319315
try {
320316
// 修改场景下直接发布,新增场景下需要先确认
321317
if (!formData.value.id) {
322318
await message.confirm('是否确认发布该流程?')
323319
}
324-
325320
//校验当前版本的流程下是否存在正在进行中的单据
326321
const res = await ModelApi.getProcessInstance(formData.value.id)
327322
if (res) {
328-
message.error('当前版本下存在正在进行中的单据,请先结束单据后再发布')
329-
return
323+
await message.confirm('流程下存在进行中的单据,是否确认发布该流程?')
330324
}
331-
332325
// 校验所有步骤
333326
await validateAllSteps()
334327
@@ -350,10 +343,7 @@ const handleDeploy = async () => {
350343
message.success('发布成功')
351344
// 返回列表页
352345
await router.push({ name: 'BpmModel' })
353-
} catch (error: any) {
354-
console.error('发布失败:', error)
355-
message.warning(error.message || '发布失败')
356-
}
346+
} catch (error: any) {}
357347
}
358348
359349
/** 步骤切换处理 */

0 commit comments

Comments
 (0)