Skip to content

Commit 2451472

Browse files
committed
code review:驳回逻辑
1 parent ada93a1 commit 2451472

File tree

3 files changed

+14
-20
lines changed

3 files changed

+14
-20
lines changed

src/api/bpm/task/index.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,12 @@ export const exportTask = async (params) => {
4242
return await request.download({ url: '/bpm/task/export', params })
4343
}
4444

45-
/**
46-
* 获取所有可回退的节点
47-
* @param params
48-
*/
45+
// 获取所有可回退的节点
4946
export const getReturnList = async (params) => {
5047
return await request.get({ url: '/bpm/task/get-return-list', params })
5148
}
5249

53-
/**
54-
* 确认回退
55-
* @param params
56-
*/
57-
export const okReturnTask = async (data) => {
50+
// 回退
51+
export const returnTask = async (data) => {
5852
return await request.put({ url: '/bpm/task/return', data })
5953
}

src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ const getResultCss = (result) => {
249249
return 'highlight-cancel'
250250
} else if (result === 5) {
251251
// 退回
252-
return 'highlight-rollback'
252+
return 'highlight-return'
253253
}
254254
return ''
255255
}
@@ -586,41 +586,41 @@ watch(
586586
}
587587
588588
/** 回退 */
589-
.highlight-rollback.djs-shape .djs-visual > :nth-child(1) {
589+
.highlight-return.djs-shape .djs-visual > :nth-child(1) {
590590
fill: #e6a23c !important;
591591
stroke: #e6a23c !important;
592592
fill-opacity: 0.2 !important;
593593
}
594-
.highlight-rollback.djs-shape .djs-visual > :nth-child(2) {
594+
.highlight-return.djs-shape .djs-visual > :nth-child(2) {
595595
fill: #e6a23c !important;
596596
}
597-
.highlight-rollback.djs-shape .djs-visual > path {
597+
.highlight-return.djs-shape .djs-visual > path {
598598
fill: #e6a23c !important;
599599
fill-opacity: 0.2 !important;
600600
stroke: #e6a23c !important;
601601
}
602-
.highlight-rollback.djs-connection > .djs-visual > path {
602+
.highlight-return.djs-connection > .djs-visual > path {
603603
stroke: #e6a23c !important;
604604
}
605605
606-
.highlight-rollback:not(.djs-connection) .djs-visual > :nth-child(1) {
606+
.highlight-return:not(.djs-connection) .djs-visual > :nth-child(1) {
607607
fill: #e6a23c !important; /* color elements as green */
608608
}
609609
610-
:deep(.highlight-rollback.djs-shape .djs-visual > :nth-child(1)) {
610+
:deep(.highlight-return.djs-shape .djs-visual > :nth-child(1)) {
611611
fill: #e6a23c !important;
612612
stroke: #e6a23c !important;
613613
fill-opacity: 0.2 !important;
614614
}
615-
:deep(.highlight-rollback.djs-shape .djs-visual > :nth-child(2)) {
615+
:deep(.highlight-return.djs-shape .djs-visual > :nth-child(2)) {
616616
fill: #e6a23c !important;
617617
}
618-
:deep(.highlight-rollback.djs-shape .djs-visual > path) {
618+
:deep(.highlight-return.djs-shape .djs-visual > path) {
619619
fill: #e6a23c !important;
620620
fill-opacity: 0.2 !important;
621621
stroke: #e6a23c !important;
622622
}
623-
:deep(.highlight-rollback.djs-connection > .djs-visual > path) {
623+
:deep(.highlight-return.djs-connection > .djs-visual > path) {
624624
stroke: #e6a23c !important;
625625
}
626626

src/views/bpm/processInstance/detail/TaskReturnDialogForm.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ const submitForm = async () => {
6868
// 提交请求
6969
formLoading.value = true
7070
try {
71-
await TaskApi.okReturnTask(formData.value)
71+
await TaskApi.returnTask(formData.value)
7272
message.success('回退成功')
7373
dialogVisible.value = false
7474
// 发送操作成功的事件

0 commit comments

Comments
 (0)