Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -135,7 +135,7 @@
|
|||||||
</el-collapse>
|
</el-collapse>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="content" v-if="active == '2'">
|
<div class="content" v-show="active == '2'">
|
||||||
<div class="block" style="padding-top: 20px;">
|
<div class="block" style="padding-top: 20px;">
|
||||||
<el-timeline>
|
<el-timeline>
|
||||||
<el-timeline-item timestamp="发起流程" placement="top" :color="user1 ? '#66b1ff' : ''">
|
<el-timeline-item timestamp="发起流程" placement="top" :color="user1 ? '#66b1ff' : ''">
|
||||||
@@ -175,7 +175,7 @@
|
|||||||
</el-timeline>
|
</el-timeline>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="content" v-if="active === '3'">
|
<div class="content" v-show="active === '3'">
|
||||||
<div class="flow-list">
|
<div class="flow-list">
|
||||||
<el-table
|
<el-table
|
||||||
height="100%"
|
height="100%"
|
||||||
|
|||||||
@@ -139,7 +139,7 @@
|
|||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="content" v-if="active === '3'">
|
<div class="content" v-show="active === '3'">
|
||||||
<div class="flow-list">
|
<div class="flow-list">
|
||||||
<el-table
|
<el-table
|
||||||
height="100%"
|
height="100%"
|
||||||
|
|||||||
@@ -136,7 +136,7 @@
|
|||||||
</el-collapse>
|
</el-collapse>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="content" v-if="active === '3'">
|
<div class="content" v-show="active === '3'">
|
||||||
<div class="flow-list">
|
<div class="flow-list">
|
||||||
<el-table
|
<el-table
|
||||||
height="100%"
|
height="100%"
|
||||||
|
|||||||
Reference in New Issue
Block a user