From b72fc1b10b08cf2fea1626d32e1ca2cccabe2edd Mon Sep 17 00:00:00 2001
From: liuwh <hugeinfo123>
Date: Tue, 31 Mar 2020 23:49:35 +0800
Subject: [PATCH] bug修复
---
SunshineIns/src/page/CareList.jsx | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/SunshineIns/src/page/CareList.jsx b/SunshineIns/src/page/CareList.jsx
index 2b2fa4e..1585a4c 100644
--- a/SunshineIns/src/page/CareList.jsx
+++ b/SunshineIns/src/page/CareList.jsx
@@ -61,7 +61,7 @@
}
componentDidMount() {
- document.title = '社会关护管理';
+ document.title = '社会观护管理';
this.getData();
}
@@ -169,7 +169,7 @@
key: 'status',
render: text => (
text == 0 ?
- <Badge style={{ backgroundColor: '#6C757C' }} count={'未开始'} /> : text == 1 ? <Badge count={'进行中'} style={{ backgroundColor: '#6C757C' }} /> : text == 2 ? <Badge count={'已结束'} style={{ backgroundColor: '#6C757C' }} /> : <Badge count={'结束'} style={{ backgroundColor: '#2ECC71' }} />
+ <Badge style={{ backgroundColor: '#6C757C' }} count={'未开始'} /> : text == 1 ? <Badge count={'进行中'} style={{ backgroundColor: '#F1C40F' }} /> : text == 2 ? <Badge count={'已结束'} style={{ backgroundColor: '#2ECC71' }} /> : <Badge count={'结束'} style={{ backgroundColor: '#2ECC71' }} />
)
}, {
title: '创建时间',
@@ -192,11 +192,7 @@
render: (text, record) => (
<span>
{
- record.status == 1 ?
- <React.Fragment>
- <Divider type="vertical" />
- <a onClick={() => this.showModal(record.id)}>结束任务</a>
- </React.Fragment> :
+ record.status == 0 ?
<React.Fragment>
<a onClick={() => this.showModal(record.id)}>编辑</a>
<Divider type="vertical" />
@@ -209,7 +205,14 @@
>
<a href="#">删除</a>
</Popconfirm>
- </React.Fragment>
+ </React.Fragment> :
+ record.status == 1 ?
+ <React.Fragment>
+ <a onClick={() => this.showModal(record.id)}>查看</a>
+ <Divider type="vertical" />
+ <a onClick={() => this.showModal(record.id)}>结束任务</a>
+ </React.Fragment> :
+ <a onClick={() => this.showModal(record.id)}>查看</a>
}
</span>
),
--
Gitblit v1.8.0