Commit 7b05117e by Mr. Lan

fix bug.

parent 45d723ce
Showing with 12 additions and 12 deletions
...@@ -90,10 +90,18 @@ ...@@ -90,10 +90,18 @@
</div> </div>
<div class="text item" style="text-align: center;margin-top:18px"> <div class="text item" style="text-align: center;margin-top:18px">
<div <div
v-if=" v-if="nodeStepList[activeIndex].activeOrder &&
!nodeStepList[activeIndex].activeOrder || processStructureValue.workOrder.state.length > 1"
processStructureValue.workOrder.state.length <= 1"
> >
<el-button
v-permisaction="['process:list:handle:active']"
type="primary"
@click="activeOrderActive"
>
主动接单
</el-button>
</div>
<div v-else>
<template v-for="(item, index) in processStructureValue.edges"> <template v-for="(item, index) in processStructureValue.edges">
<el-button <el-button
v-if="item.source===nodeStepList[activeIndex].id && processStructureValue.workOrder.is_end===0" v-if="item.source===nodeStepList[activeIndex].id && processStructureValue.workOrder.is_end===0"
...@@ -105,15 +113,6 @@ ...@@ -105,15 +113,6 @@
</el-button> </el-button>
</template> </template>
</div> </div>
<div v-else>
<el-button
v-permisaction="['process:list:handle:active']"
type="primary"
@click="activeOrderActive"
>
主动接单
</el-button>
</div>
</div> </div>
</div> </div>
</el-card> </el-card>
...@@ -231,6 +230,7 @@ export default { ...@@ -231,6 +230,7 @@ export default {
// 当前节点 // 当前节点
this.nodeStepList.push(this.processStructureValue.nodes[i]) this.nodeStepList.push(this.processStructureValue.nodes[i])
this.activeIndex = this.nodeStepList.length - 1 this.activeIndex = this.nodeStepList.length - 1
console.log(this.processStructureValue.workOrder.state.length, this.processStructureValue.workOrder.state.length <= 1)
if (i + 1 === this.processStructureValue.nodes.length) { if (i + 1 === this.processStructureValue.nodes.length) {
this.activeIndex = this.nodeStepList.length this.activeIndex = this.nodeStepList.length
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment