浏览代码

code review:驳回逻辑

YunaiV 1 年之前
父节点
当前提交
245147223f

+ 3 - 9
src/api/bpm/task/index.ts

@@ -42,18 +42,12 @@ export const exportTask = async (params) => {
   return await request.download({ url: '/bpm/task/export', params })
 }
 
-/**
- * 获取所有可回退的节点
- * @param params
- */
+// 获取所有可回退的节点
 export const getReturnList = async (params) => {
   return await request.get({ url: '/bpm/task/get-return-list', params })
 }
 
-/**
- * 确认回退
- * @param params
- */
-export const okReturnTask = async (data) => {
+// 回退
+export const returnTask = async (data) => {
   return await request.put({ url: '/bpm/task/return', data })
 }

+ 10 - 10
src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue

@@ -249,7 +249,7 @@ const getResultCss = (result) => {
     return 'highlight-cancel'
   } else if (result === 5) {
     // 退回
-    return 'highlight-rollback'
+    return 'highlight-return'
   }
   return ''
 }
@@ -586,41 +586,41 @@ watch(
 }
 
 /** 回退 */
-.highlight-rollback.djs-shape .djs-visual > :nth-child(1) {
+.highlight-return.djs-shape .djs-visual > :nth-child(1) {
   fill: #e6a23c !important;
   stroke: #e6a23c !important;
   fill-opacity: 0.2 !important;
 }
-.highlight-rollback.djs-shape .djs-visual > :nth-child(2) {
+.highlight-return.djs-shape .djs-visual > :nth-child(2) {
   fill: #e6a23c !important;
 }
-.highlight-rollback.djs-shape .djs-visual > path {
+.highlight-return.djs-shape .djs-visual > path {
   fill: #e6a23c !important;
   fill-opacity: 0.2 !important;
   stroke: #e6a23c !important;
 }
-.highlight-rollback.djs-connection > .djs-visual > path {
+.highlight-return.djs-connection > .djs-visual > path {
   stroke: #e6a23c !important;
 }
 
-.highlight-rollback:not(.djs-connection) .djs-visual > :nth-child(1) {
+.highlight-return:not(.djs-connection) .djs-visual > :nth-child(1) {
   fill: #e6a23c !important; /* color elements as green */
 }
 
-:deep(.highlight-rollback.djs-shape .djs-visual > :nth-child(1)) {
+:deep(.highlight-return.djs-shape .djs-visual > :nth-child(1)) {
   fill: #e6a23c !important;
   stroke: #e6a23c !important;
   fill-opacity: 0.2 !important;
 }
-:deep(.highlight-rollback.djs-shape .djs-visual > :nth-child(2)) {
+:deep(.highlight-return.djs-shape .djs-visual > :nth-child(2)) {
   fill: #e6a23c !important;
 }
-:deep(.highlight-rollback.djs-shape .djs-visual > path) {
+:deep(.highlight-return.djs-shape .djs-visual > path) {
   fill: #e6a23c !important;
   fill-opacity: 0.2 !important;
   stroke: #e6a23c !important;
 }
-:deep(.highlight-rollback.djs-connection > .djs-visual > path) {
+:deep(.highlight-return.djs-connection > .djs-visual > path) {
   stroke: #e6a23c !important;
 }
 

+ 1 - 1
src/views/bpm/processInstance/detail/TaskReturnDialogForm.vue

@@ -68,7 +68,7 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    await TaskApi.okReturnTask(formData.value)
+    await TaskApi.returnTask(formData.value)
     message.success('回退成功')
     dialogVisible.value = false
     // 发送操作成功的事件