From d99603fa4c5188d19991de978c185b2b9247c5af Mon Sep 17 00:00:00 2001
From: xuxj <hugeinfo123>
Date: Sat, 09 May 2020 09:22:02 +0800
Subject: [PATCH] Merge branch 'master' of http://git.hugeinfo.com.cn/r/nsjcy/frontEnd/nsjcy
---
SunshineIns/src/page/CareList.jsx | 67 +++++++++++++++++++++------------
1 files changed, 42 insertions(+), 25 deletions(-)
diff --git a/SunshineIns/src/page/CareList.jsx b/SunshineIns/src/page/CareList.jsx
index 1fa8e21..2a9e0a6 100644
--- a/SunshineIns/src/page/CareList.jsx
+++ b/SunshineIns/src/page/CareList.jsx
@@ -32,6 +32,7 @@
1,
2,
3,
+ 4
]
const activityStatusIds = {
0: '未开始',
@@ -41,9 +42,9 @@
}
const activityStatusList = [
+ 0,
1,
- 2,
- 3,
+ 2
]
export default class CareList extends React.Component {
constructor(props) {
@@ -61,7 +62,7 @@
}
componentDidMount() {
- document.title = '社会关护管理';
+ document.title = '社会观护管理';
this.getData();
}
@@ -77,12 +78,23 @@
this.setState({
formData: data,
});
- this.getData();
+ this.setState({ loading: true })
+ Fetch.socialQuery({ ...data })
+ .then(res => {
+ console.log(res)
+ for (var i = 0; i < res.rows.length; i++) {
+ res.rows[i]['index'] = i + 1;
+ }
+ this.setState({
+ data: res.rows,
+ loading: false,
+ });
+ });
}
getData = () => {
const { formData } = this.state;
- this.setState({loading:true})
+ this.setState({ loading: true })
Fetch.socialQuery({ ...formData })
.then(res => {
console.log(res)
@@ -91,7 +103,7 @@
}
this.setState({
data: res.rows,
- loading:false,
+ loading: false,
});
});
}
@@ -158,7 +170,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: '创建时间',
@@ -175,28 +187,33 @@
dataIndex: 'endTime',
key: 'endTime',
render: text => <span>{moment(text).format("YYYY-MM-DD HH:mm")}</span>
- },{
+ }, {
title: '操作',
key: 'action',
render: (text, record) => (
<span>
- <a onClick={() => this.showModal(record.id)}>编辑</a>
- <Divider type="vertical" />
- <Popconfirm
- title="确认删除任务吗?"
- id={record.id}
- onConfirm={e => this.confirm(record.id)}
- okText="确定"
- cancelText="取消"
- >
- <a href="#">删除</a>
- </Popconfirm>
{
- record.status == 1 ?
+ record.status == 0 ?
<React.Fragment>
+ <a onClick={() => this.showModal(record.id)}>编辑</a>
<Divider type="vertical" />
- <a onClick={() => this.showModal(record.id)}>结束任务</a>
- </React.Fragment> : ''
+ <Popconfirm
+ title="确认删除任务吗?"
+ id={record.id}
+ onConfirm={e => this.confirm(record.id)}
+ okText="确定"
+ cancelText="取消"
+ >
+ <a href="#">删除</a>
+ </Popconfirm>
+ </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>
),
@@ -208,10 +225,10 @@
<div style={{ marginLeft: '90%', marginBottom: '20px', marginTop: '20px' }}>
<Button type="primary" size='large' onClick={() => this.showModal('new')}>新建任务</Button>
</div>
- {/* <Breadcrumb style={{ padding: '20px' }}>
+ <Breadcrumb style={{ padding: '20px' }}>
<Breadcrumb.Item><a href="">后台中心</a></Breadcrumb.Item>
<Breadcrumb.Item>社会关护</Breadcrumb.Item>
- </Breadcrumb> */}
+ </Breadcrumb>
<div style={{ background: '#fff', margin: 20 }}>
<CommonSearchForm
{...this.props}
@@ -240,7 +257,7 @@
keylistName: 'rangeTimelist',
},
]} />
- <TableView columns={columns} data={data} pageSize='10' size='default' loading={loading}/>
+ <TableView columns={columns} data={data} pageSize='10' size='default' loading={loading} />
</div>
</div>
);
--
Gitblit v1.8.0