From f7e9b835c30e5b3287b2c04e24950871cafa907d Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Mon, 07 Sep 2020 15:28:45 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/huge/frontEnd/hugeOA
---
src/components/oa/merits/meritsOverview/index.jsx | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/components/oa/merits/meritsOverview/index.jsx b/src/components/oa/merits/meritsOverview/index.jsx
index 3a3794b..a5bed18 100644
--- a/src/components/oa/merits/meritsOverview/index.jsx
+++ b/src/components/oa/merits/meritsOverview/index.jsx
@@ -56,6 +56,11 @@
linkDetail = (item) => {
let { userId, countMonth } = item;
+ history.push(`/merits/meritsOverview/meritsDetail/${userId}/false/${countMonth}`)
+ }
+
+ linkScore = (item) => {
+ let { userId, countMonth } = item;
history.push(`/merits/meritsOverview/meritsDetail/${userId}/true/${countMonth}`)
}
@@ -66,13 +71,15 @@
{ title: '部门', dataIndex: 'userDeptName' },
{ title: '岗位', dataIndex: 'meritsPostName' },
{ title: '考评月份', dataIndex: 'countMonth' },
- { title: '总任务数', dataIndex: 'taskNumber' },
- { title: '总缺陷数', dataIndex: 'defectNumber' },
+ // { title: '总任务数', dataIndex: 'taskNumber' },
+ // { title: '总缺陷数', dataIndex: 'defectNumber' },
{ title: '考评得分(分)', dataIndex: 'meritsGrade' },
{
title: '操作', dataIndex: 'operation', render: (cur, item) => {
return <Row>
<a onClick={() => this.linkDetail(item)}>详情</a>
+ <span> | </span>
+ <a onClick={() => this.linkScore(item)}>评分</a>
</Row>
}
},
--
Gitblit v1.8.0