File tree Expand file tree Collapse file tree 3 files changed +7
-20
lines changed Expand file tree Collapse file tree 3 files changed +7
-20
lines changed Original file line number Diff line number Diff line change @@ -78,11 +78,11 @@ export const cleanModel = async (id: number) => {
78
78
}
79
79
/**
80
80
* 查询当前流程实例下是否存在正在进行中的单据
81
- * @param processDefinitionId 流程定义id
81
+ * @param modelId 模型定义id
82
82
* @returns true/false
83
83
*/
84
- export const getProcessInstance = async ( processDefinitionId : string ) => {
84
+ export const getProcessInstance = async ( modelId : string ) => {
85
85
return await request . get ( {
86
- url : '/bpm/task/manager-list?processDefinitionId =' + processDefinitionId
86
+ url : '/bpm/task/manager-list?modelId =' + modelId
87
87
} )
88
88
}
Original file line number Diff line number Diff line change @@ -445,13 +445,10 @@ const handleChangeState = async (row: any) => {
445
445
/** 发布流程 */
446
446
const handleDeploy = async (row : any ) => {
447
447
try {
448
- // 发布的二次确认
449
- await message .confirm (' 是否发布该流程!!' )
450
448
// 校验当前版本的流程下是否存在正在进行中的单据
451
449
const res = await ModelApi .getProcessInstance (row .id )
452
450
if (res ) {
453
- message .error (' 当前版本下存在正在进行中的单据,请先结束单据后再发布' )
454
- return
451
+ await message .confirm (' 流程下存在进行中的单据,是否确认发布该流程?' )
455
452
}
456
453
// 发起部署
457
454
await ModelApi .deployModel (row .id )
Original file line number Diff line number Diff line change @@ -179,8 +179,6 @@ const userList = ref<UserApi.UserVO[]>([])
179
179
180
180
/** 初始化数据 */
181
181
const initData = async () => {
182
- console .log (route .params );
183
-
184
182
const modelId = route .params .id as string
185
183
if (modelId ) {
186
184
// 修改场景
@@ -297,7 +295,7 @@ const handleSave = async () => {
297
295
// 跳转到编辑页面
298
296
await router .push ({
299
297
name: ' BpmModelUpdate' ,
300
- params: { id: formData .value .id }
298
+ params: { id: formData .value .id }
301
299
})
302
300
} catch {
303
301
// 先删除当前页签
@@ -314,21 +312,16 @@ const handleSave = async () => {
314
312
315
313
/** 发布操作 */
316
314
const handleDeploy = async () => {
317
- console .log (route .params );
318
-
319
315
try {
320
316
// 修改场景下直接发布,新增场景下需要先确认
321
317
if (! formData .value .id ) {
322
318
await message .confirm (' 是否确认发布该流程?' )
323
319
}
324
-
325
320
// 校验当前版本的流程下是否存在正在进行中的单据
326
321
const res = await ModelApi .getProcessInstance (formData .value .id )
327
322
if (res ) {
328
- message .error (' 当前版本下存在正在进行中的单据,请先结束单据后再发布' )
329
- return
323
+ await message .confirm (' 流程下存在进行中的单据,是否确认发布该流程?' )
330
324
}
331
-
332
325
// 校验所有步骤
333
326
await validateAllSteps ()
334
327
@@ -350,10 +343,7 @@ const handleDeploy = async () => {
350
343
message .success (' 发布成功' )
351
344
// 返回列表页
352
345
await router .push ({ name: ' BpmModel' })
353
- } catch (error : any ) {
354
- console .error (' 发布失败:' , error )
355
- message .warning (error .message || ' 发布失败' )
356
- }
346
+ } catch (error : any ) {}
357
347
}
358
348
359
349
/** 步骤切换处理 */
You can’t perform that action at this time.
0 commit comments