|
@@ -122,6 +122,10 @@
|
|
|
<template v-slot:orderNum="{ row }">
|
|
<template v-slot:orderNum="{ row }">
|
|
|
{{ row.orderNum }}
|
|
{{ row.orderNum }}
|
|
|
</template>
|
|
</template>
|
|
|
|
|
+
|
|
|
|
|
+ <template v-slot:isParallel="{ row }">
|
|
|
|
|
+ {{ !!row.isParallel ? '是' : '否' }}
|
|
|
|
|
+ </template>
|
|
|
</ele-pro-table>
|
|
</ele-pro-table>
|
|
|
<bpmDetail
|
|
<bpmDetail
|
|
|
v-if="activeComp == 'bpm' && form.processInstanceId"
|
|
v-if="activeComp == 'bpm' && form.processInstanceId"
|
|
@@ -211,6 +215,14 @@
|
|
|
align: 'center',
|
|
align: 'center',
|
|
|
minWidth: 110
|
|
minWidth: 110
|
|
|
},
|
|
},
|
|
|
|
|
+ {
|
|
|
|
|
+ prop: 'isParallel',
|
|
|
|
|
+ label: '并行工序',
|
|
|
|
|
+ showOverflowTooltip: true,
|
|
|
|
|
+ align: 'center',
|
|
|
|
|
+ slot: 'isParallel',
|
|
|
|
|
+ minWidth: 110
|
|
|
|
|
+ },
|
|
|
{
|
|
{
|
|
|
align: 'center',
|
|
align: 'center',
|
|
|
prop: 'controlName',
|
|
prop: 'controlName',
|
|
@@ -257,6 +269,7 @@
|
|
|
|
|
|
|
|
let arr = res?.list?.map((it) => {
|
|
let arr = res?.list?.map((it) => {
|
|
|
it.detail.orderNum = it.orderNum;
|
|
it.detail.orderNum = it.orderNum;
|
|
|
|
|
+ it.detail.isParallel = it.isParallel;
|
|
|
return it.detail;
|
|
return it.detail;
|
|
|
});
|
|
});
|
|
|
return {
|
|
return {
|