|
|
@@ -140,20 +140,21 @@
|
|
|
>
|
|
|
<template slot-scope="scope">{{ scope.row.createBy | getUserName(userList)}}</template>
|
|
|
</el-table-column>
|
|
|
- <!-- <el-table-column
|
|
|
+ <el-table-column
|
|
|
+ v-if="['finish'].includes(activeTab)"
|
|
|
show-overflow-tooltip
|
|
|
label="提交人"
|
|
|
width="100"
|
|
|
>
|
|
|
- <template slot-scope="scope">{{ getParenthesesStr(scope.row.subject)[2] }}</template>
|
|
|
- </el-table-column> -->
|
|
|
+ <template slot-scope="scope">{{ scope.row.updateBy ? scope.row.updateBy : scope.row.createBy | getUserName(userList) }}</template>
|
|
|
+ </el-table-column>
|
|
|
</template>
|
|
|
<el-table-column
|
|
|
show-overflow-tooltip
|
|
|
width="160"
|
|
|
:label="item.time + '时间'"
|
|
|
>
|
|
|
- <template slot-scope="scope">{{ scope.row[field] ? scope.row[field].slice(0, 16) : scope.row.createTime.slice(0, 16) }}</template>
|
|
|
+ <template slot-scope="scope">{{ scope.row[item.field] ? scope.row[item.field].slice(0, 16) : scope.row.createTime.slice(0, 16) }}</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
<div v-if="dataList.length">
|
cfort