|
@@ -141,12 +141,12 @@
|
|
|
<template slot-scope="scope">{{ scope.row.createBy | getUserName(userList)}}</template>
|
|
<template slot-scope="scope">{{ scope.row.createBy | getUserName(userList)}}</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
<el-table-column
|
|
|
- v-if="['finish'].includes(activeTab)"
|
|
|
|
|
|
|
+
|
|
|
show-overflow-tooltip
|
|
show-overflow-tooltip
|
|
|
label="提交人"
|
|
label="提交人"
|
|
|
width="100"
|
|
width="100"
|
|
|
>
|
|
>
|
|
|
- <template slot-scope="scope">{{ scope.row.updateBy ? scope.row.updateBy : scope.row.createBy | getUserName(userList) }}</template>
|
|
|
|
|
|
|
+ <template slot-scope="scope">{{ getName(scope.row) }}</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
</template>
|
|
</template>
|
|
|
<el-table-column
|
|
<el-table-column
|
|
@@ -391,6 +391,15 @@
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
|
|
+ getName ({createBy, updateBy}) {
|
|
|
|
|
+ const id = updateBy ? updateBy : createBy
|
|
|
|
|
+ const { name = '' } = this.$store.getters
|
|
|
|
|
+ if (this.activeTab === 'finish') {
|
|
|
|
|
+ let t = this.userList.find(i => i.userId === id)
|
|
|
|
|
+ return t ? t.userName : ''
|
|
|
|
|
+ }
|
|
|
|
|
+ return name
|
|
|
|
|
+ },
|
|
|
tableRowClassName({ row, rowIndex }) {
|
|
tableRowClassName({ row, rowIndex }) {
|
|
|
if (rowIndex % 2 === 1) return 'warning-row'
|
|
if (rowIndex % 2 === 1) return 'warning-row'
|
|
|
return 'success-row'
|
|
return 'success-row'
|