From 2d0e600900696bb309d09efd47fd7d4980eeb172 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Mon, 01 Jun 2020 16:11:28 +0800
Subject: [PATCH] 页面调整
---
src/components/oa/merits/meritsDetail/index.jsx | 4 ++--
src/components/oa/merits/meritsOverview/index.jsx | 4 ++--
src/components/common/TopListTableView/index.jsx | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/components/common/TopListTableView/index.jsx b/src/components/common/TopListTableView/index.jsx
index d607e53..69f34c1 100644
--- a/src/components/common/TopListTableView/index.jsx
+++ b/src/components/common/TopListTableView/index.jsx
@@ -32,7 +32,7 @@
topList: [
{ ...tag['latenessRanking'], dataSource: res['latenessRanking'] },
{ ...tag['earlyRanking'], dataSource: res['earlyRanking'] },
- // { ...tag['meritsRanking'], dataSource: res['meritsRanking'] },
+ { ...tag['meritsRanking'], dataSource: res['meritsRanking'] },
{ ...tag['defectRanking'], dataSource: res['defectRanking'] },
]
})
diff --git a/src/components/oa/merits/meritsDetail/index.jsx b/src/components/oa/merits/meritsDetail/index.jsx
index 51f2e1f..ce9d01d 100644
--- a/src/components/oa/merits/meritsDetail/index.jsx
+++ b/src/components/oa/merits/meritsDetail/index.jsx
@@ -71,11 +71,11 @@
// 保存操作
onSave = (item) => {
console.log('item', item);
- let { id, meritsGrade } = item;
+ let { meritsAssessId, meritsGrade } = item;
fetch({
url: `api/merits/assess/modifyGrade`,
params: {
- id,
+ id : meritsAssessId,
meritsGrade
}
}).then(res => {
diff --git a/src/components/oa/merits/meritsOverview/index.jsx b/src/components/oa/merits/meritsOverview/index.jsx
index 3a3794b..71d92c0 100644
--- a/src/components/oa/merits/meritsOverview/index.jsx
+++ b/src/components/oa/merits/meritsOverview/index.jsx
@@ -66,8 +66,8 @@
{ 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) => {
--
Gitblit v1.8.0