|
|
@@ -13,7 +13,8 @@
|
|
|
:columns="columns"
|
|
|
:datasource="datasource"
|
|
|
:cache-key="cacheKeyUrl"
|
|
|
- @columns-change="handleColumnChange"
|
|
|
+ height="calc(100vh - 420px)"
|
|
|
+ @columns-change="handleColumnChange"
|
|
|
autoAmendPage
|
|
|
>
|
|
|
<template v-slot:toolbar> </template>
|
|
|
@@ -185,7 +186,7 @@
|
|
|
showOverflowTooltip: true,
|
|
|
minWidth: 110,
|
|
|
formatter: (row) => {
|
|
|
- if ((row.type == 2 && row.status == 1) || row.type != 1) {
|
|
|
+ if ((row.type == 1 && row.status == 2) || row.type != 1) {
|
|
|
return row.executeUsers.map((i) => i.userName).join(',');
|
|
|
}
|
|
|
return '';
|
