|
|
@@ -86,6 +86,7 @@
|
|
|
label="发起部门"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
+ :key="Date.now() + Math.random()"
|
|
|
prop="submitBy"
|
|
|
show-overflow-tooltip
|
|
|
width="100"
|
|
|
@@ -101,6 +102,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
+ :key="Date.now() + Math.random()"
|
|
|
prop="forwardBy"
|
|
|
show-overflow-tooltip
|
|
|
width="100"
|
|
|
@@ -138,20 +140,20 @@
|
|
|
>
|
|
|
<template slot-scope="scope">{{ scope.row.createBy | getUserName(userList)}}</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
+ <!-- <el-table-column
|
|
|
show-overflow-tooltip
|
|
|
label="提交人"
|
|
|
width="100"
|
|
|
>
|
|
|
<template slot-scope="scope">{{ getParenthesesStr(scope.row.subject)[2] }}</template>
|
|
|
- </el-table-column>
|
|
|
+ </el-table-column> -->
|
|
|
</template>
|
|
|
<el-table-column
|
|
|
show-overflow-tooltip
|
|
|
width="160"
|
|
|
:label="item.time + '时间'"
|
|
|
>
|
|
|
- <template slot-scope="scope">{{ scope.row.createTime.slice(0, 16) }}</template>
|
|
|
+ <template slot-scope="scope">{{ scope.row[field] ? scope.row[field].slice(0, 16) : scope.row.createTime.slice(0, 16) }}</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
<div v-if="dataList.length">
|
|
|
@@ -199,25 +201,29 @@
|
|
|
label: '待办事宜',
|
|
|
key: 'wait',
|
|
|
icon: 'el-icon-edit',
|
|
|
- time: '提交'
|
|
|
+ time: '提交',
|
|
|
+ field: 'createTime'
|
|
|
},
|
|
|
{
|
|
|
label: '已办事宜',
|
|
|
key: 'over',
|
|
|
icon: 'el-icon-document-remove',
|
|
|
- time: '办理'
|
|
|
+ time: '办理',
|
|
|
+ field: 'updateTime'
|
|
|
},
|
|
|
{
|
|
|
label: '办结事宜',
|
|
|
key: 'finish',
|
|
|
icon: 'el-icon-paperclip',
|
|
|
- time: '结束'
|
|
|
+ time: '结束',
|
|
|
+ field: 'updateTime'
|
|
|
},
|
|
|
{
|
|
|
label: '暂存事宜',
|
|
|
key: 'save',
|
|
|
icon: 'el-icon-receiving',
|
|
|
- time: '暂存'
|
|
|
+ time: '暂存',
|
|
|
+ field: 'createTime'
|
|
|
}
|
|
|
]
|
|
|
const taskState = {
|
cfort