|
|
@@ -42,34 +42,54 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column align="center" min-width="100" label="表彰人员">
|
|
|
<template slot-scope="props">
|
|
|
- <div v-for="(item, index) in props.row.groupUsers" :key="index">
|
|
|
- {{ item.userName }}
|
|
|
- </div>
|
|
|
+ <el-popover trigger="hover">
|
|
|
+ <el-table :data="props.row.groupUsers" border size="mini">
|
|
|
+ <el-table-column min-width="200" align="center" prop="deptName" label="部门"></el-table-column>
|
|
|
+ <el-table-column min-width="100" align="center" prop="userName" label="姓名"></el-table-column>
|
|
|
+ <el-table-column min-width="100" align="center" prop="employeNo" label="员工号"></el-table-column>
|
|
|
+ </el-table>
|
|
|
+ <span style="color: #1e80ff;cursor: pointer;" slot="reference">查看</span>
|
|
|
+ </el-popover>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" prop="customerName" min-width="100" label="客户名称">
|
|
|
+ <el-table-column align="center" min-width="150" label="客户名称">
|
|
|
+ <template slot-scope="props">
|
|
|
+ <el-popover width="200" trigger="hover" :content="props.row.customerName">
|
|
|
+ <div slot="reference" class="text-overflow">{{ props.row.customerName }}</div>
|
|
|
+ </el-popover>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" prop="title" min-width="100" label="表彰名称">
|
|
|
+ <el-table-column align="center" min-width="150" label="表彰名称">
|
|
|
+ <template slot-scope="props">
|
|
|
+ <el-popover width="200" trigger="hover" :content="props.row.title">
|
|
|
+ <div slot="reference" class="text-overflow">{{ props.row.title }}</div>
|
|
|
+ </el-popover>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" min-width="80px" label="上传人" prop="userName">
|
|
|
+ <el-table-column min-width="100" align="center" label="表彰描述">
|
|
|
+ <template slot-scope="props">
|
|
|
+ <el-popover width="200" trigger="hover" :content="props.row.content">
|
|
|
+ <div slot="reference" class="text-overflow">{{ props.row.content }}</div>
|
|
|
+ </el-popover>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
- <!-- <el-table-column align="center" min-width="250px" label="公司" prop="companyName">
|
|
|
- </el-table-column> -->
|
|
|
<el-table-column align="center" min-width="250px" label="部门" prop="deptName">
|
|
|
</el-table-column>
|
|
|
+ <el-table-column align="center" min-width="80px" label="上传人" prop="userName">
|
|
|
+ </el-table-column>
|
|
|
<el-table-column align="center" min-width="80px" label="获得积分" prop="integral">
|
|
|
</el-table-column>
|
|
|
<el-table-column align="center" min-width="120px" label="审核状态">
|
|
|
<template slot-scope="props">
|
|
|
- <el-popover>
|
|
|
- <el-table :data="props.row.logs" border size="mini">
|
|
|
- <el-table-column min-width="80" align="center" prop="auditor" label="处理人"></el-table-column>
|
|
|
- <el-table-column min-width="160" align="center" prop="comment" label="处理结果"></el-table-column>
|
|
|
- <el-table-column min-width="180" align="center" prop="createTime" label="处理时间"></el-table-column>
|
|
|
- </el-table>
|
|
|
- <span style="color: #1e80ff;cursor: pointer;" slot="reference">{{ props.row.statusName }}</span>
|
|
|
- </el-popover>
|
|
|
- </template>
|
|
|
+ <el-popover trigger="hover">
|
|
|
+ <el-table :data="props.row.logs" border size="mini">
|
|
|
+ <el-table-column min-width="80" align="center" prop="auditor" label="处理人"></el-table-column>
|
|
|
+ <el-table-column min-width="160" align="center" prop="comment" label="处理结果"></el-table-column>
|
|
|
+ <el-table-column min-width="180" align="center" prop="createTime" label="处理时间"></el-table-column>
|
|
|
+ </el-table>
|
|
|
+ <span style="color: #1e80ff;cursor: pointer;" slot="reference">{{ props.row.statusName }}</span>
|
|
|
+ </el-popover>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
<el-table-column align="center" min-width="100px" label="日期" prop="createTime">
|
|
|
</el-table-column>
|
|
|
@@ -86,6 +106,14 @@
|
|
|
</template>
|
|
|
|
|
|
<style>
|
|
|
+.text-overflow {
|
|
|
+ overflow: hidden;
|
|
|
+ text-overflow: ellipsis;
|
|
|
+ display: -webkit-box;
|
|
|
+ -webkit-box-orient: vertical;
|
|
|
+ -webkit-line-clamp: 1;
|
|
|
+}
|
|
|
+
|
|
|
.demo-table-expand {
|
|
|
font-size: 0;
|
|
|
}
|
|
|
@@ -114,8 +142,8 @@ export default {
|
|
|
directives: { waves },
|
|
|
data() {
|
|
|
return {
|
|
|
- detailData:{},
|
|
|
- tableData:[],
|
|
|
+ detailData: {},
|
|
|
+ tableData: [],
|
|
|
dialogVisible: false,
|
|
|
categoryList: [],
|
|
|
typeList: [],
|
