Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
91244047 by renchao@pashanhoo.com
Options

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents ab4268de 8edac6ad
Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
...@@ -101,7 +101,7 @@ export default { ...@@ -101,7 +101,7 @@ export default {
101 finishedInfo: { 101 finishedInfo: {
102 finishedTaskSet: result.finishedActivityIds, 102 finishedTaskSet: result.finishedActivityIds,
103 unfinishedTaskSet: result.runningActivityIds, 103 unfinishedTaskSet: result.runningActivityIds,
104 rejectedTaskSet: {}, 104 rejectedTaskSet: result.rejectedActivityIds,
105 finishedSequenceFlowSet: result.finishedSequenceFlowIds 105 finishedSequenceFlowSet: result.finishedSequenceFlowIds
106 }, 106 },
107 handlinglist: result.runningTasks, 107 handlinglist: result.runningTasks,
......
...@@ -91,7 +91,7 @@ export default { ...@@ -91,7 +91,7 @@ export default {
91 finishedInfo: { 91 finishedInfo: {
92 finishedTaskSet: result.finishedActivityIds, 92 finishedTaskSet: result.finishedActivityIds,
93 unfinishedTaskSet: result.runningActivityIds, 93 unfinishedTaskSet: result.runningActivityIds,
94 rejectedTaskSet: {}, 94 rejectedTaskSet: result.rejectedActivityIds,
95 finishedSequenceFlowSet: result.finishedSequenceFlowIds 95 finishedSequenceFlowSet: result.finishedSequenceFlowIds
96 }, 96 },
97 handlinglist: result.runningTasks, 97 handlinglist: result.runningTasks,
......