|
|
@ -3,12 +3,12 @@ import React, { useEffect, useState, useRef } from "react"; |
|
|
import { connect } from "react-redux"; |
|
|
import { connect } from "react-redux"; |
|
|
import { Button, Popconfirm } from "antd"; |
|
|
import { Button, Popconfirm } from "antd"; |
|
|
import ProTable from "@ant-design/pro-table"; |
|
|
import ProTable from "@ant-design/pro-table"; |
|
|
import {postProject} from "../actions/article"; |
|
|
import { postProject, delCancel,postInProject } from "../actions/article"; |
|
|
import moment from "moment"; |
|
|
import moment from "moment"; |
|
|
import { push } from "react-router-redux"; |
|
|
import { push } from "react-router-redux"; |
|
|
import { Scroller } from "$components"; |
|
|
import { Scroller } from "$components"; |
|
|
import ProjectModeal from '../components/modeal' |
|
|
import ProjectModeal from "../components/modeal"; |
|
|
import ImportModeal from '../components/import_model' |
|
|
import ImportModeal from "../components/import_model"; |
|
|
|
|
|
|
|
|
export const Default = (props) => { |
|
|
export const Default = (props) => { |
|
|
const { dispatch } = props; |
|
|
const { dispatch } = props; |
|
|
@ -19,9 +19,7 @@ export const Default = (props) => { |
|
|
const [visible, setVisible] = useState(false); //弹窗
|
|
|
const [visible, setVisible] = useState(false); //弹窗
|
|
|
const [editData, setEditData] = useState(); //数据
|
|
|
const [editData, setEditData] = useState(); //数据
|
|
|
const [importVisible, setImportVisible] = useState(false); //弹窗
|
|
|
const [importVisible, setImportVisible] = useState(false); //弹窗
|
|
|
|
|
|
|
|
|
const tableActionRef = useRef(); |
|
|
const tableActionRef = useRef(); |
|
|
const dataSore = [{ name_project: '企服v1.0.1', part_people: '投入研发3、测试1', build_time: new Date( ), publish_time: new Date( ), progress: '研发中' }] |
|
|
|
|
|
const columns = [ |
|
|
const columns = [ |
|
|
{ |
|
|
{ |
|
|
title: "项目计划", |
|
|
title: "项目计划", |
|
|
@ -38,7 +36,20 @@ export const Default = (props) => { |
|
|
dataIndex: "part_people", |
|
|
dataIndex: "part_people", |
|
|
hideInSearch: true, |
|
|
hideInSearch: true, |
|
|
render: (dom, record) => { |
|
|
render: (dom, record) => { |
|
|
return <div>{record.part_people.map((i, index) => record.part_people.length == 1 ? <span>{i.name_people}</span> : <span>{i.name_people}{index < record.part_people.length-1 ? '、':'' }</span>) }</div> |
|
|
return ( |
|
|
|
|
|
<div> |
|
|
|
|
|
{record.part_people.map((i, index) => |
|
|
|
|
|
record.part_people.length == 1 ? ( |
|
|
|
|
|
<span>{i.name_people}</span> |
|
|
|
|
|
) : ( |
|
|
|
|
|
<span> |
|
|
|
|
|
{i.name_people} |
|
|
|
|
|
{index < record.part_people.length - 1 ? "、" : ""} |
|
|
|
|
|
</span> |
|
|
|
|
|
) |
|
|
|
|
|
)} |
|
|
|
|
|
</div> |
|
|
|
|
|
); |
|
|
}, |
|
|
}, |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
@ -47,7 +58,7 @@ export const Default = (props) => { |
|
|
dataIndex: "build_time", |
|
|
dataIndex: "build_time", |
|
|
hideInSearch: true, |
|
|
hideInSearch: true, |
|
|
render: (dom, record) => { |
|
|
render: (dom, record) => { |
|
|
return moment(record.build_time).format('YYYY-MM-DD') |
|
|
return moment(record.build_time).format("YYYY-MM-DD"); |
|
|
}, |
|
|
}, |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
@ -56,7 +67,7 @@ export const Default = (props) => { |
|
|
dataIndex: "publish_time", |
|
|
dataIndex: "publish_time", |
|
|
hideInSearch: true, |
|
|
hideInSearch: true, |
|
|
render: (dom, record) => { |
|
|
render: (dom, record) => { |
|
|
return moment(record.publish_time).format('YYYY-MM-DD') |
|
|
return moment(record.publish_time).format("YYYY-MM-DD"); |
|
|
}, |
|
|
}, |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
@ -65,7 +76,7 @@ export const Default = (props) => { |
|
|
hideInSearch: true, |
|
|
hideInSearch: true, |
|
|
order: 3, |
|
|
order: 3, |
|
|
render: (dom, record) => { |
|
|
render: (dom, record) => { |
|
|
return record.progress |
|
|
return record.progress; |
|
|
}, |
|
|
}, |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
@ -87,14 +98,13 @@ export const Default = (props) => { |
|
|
<Popconfirm |
|
|
<Popconfirm |
|
|
title="确认删除?" |
|
|
title="确认删除?" |
|
|
onConfirm={() => { |
|
|
onConfirm={() => { |
|
|
delDataList(record.id); |
|
|
delDataList(record); |
|
|
}} |
|
|
}} |
|
|
> |
|
|
> |
|
|
<Button type="link">删除</Button> |
|
|
<Button type="link">删除</Button> |
|
|
</Popconfirm> |
|
|
</Popconfirm> |
|
|
</div> |
|
|
</div> |
|
|
) |
|
|
); |
|
|
|
|
|
|
|
|
}, |
|
|
}, |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
@ -108,7 +118,7 @@ export const Default = (props) => { |
|
|
type="primary" |
|
|
type="primary" |
|
|
style={{ width: "200px" }} |
|
|
style={{ width: "200px" }} |
|
|
onClick={() => { |
|
|
onClick={() => { |
|
|
setImportVisible(true) |
|
|
setImportVisible(true); |
|
|
}} |
|
|
}} |
|
|
> |
|
|
> |
|
|
项目信息导入 |
|
|
项目信息导入 |
|
|
@ -118,27 +128,50 @@ export const Default = (props) => { |
|
|
}, |
|
|
}, |
|
|
]; |
|
|
]; |
|
|
const handleCancel = () => { |
|
|
const handleCancel = () => { |
|
|
setVisible(false) |
|
|
tableActionRef.current.reload(); |
|
|
} |
|
|
setVisible(false); |
|
|
const handOk = () => { |
|
|
}; |
|
|
|
|
|
const handOk = (values) => { |
|
|
|
|
|
const query = [{ |
|
|
|
|
|
build_time: values.build_time, |
|
|
|
|
|
name_project: values.name_project, |
|
|
|
|
|
part_people: values.part_people.map((i) => { |
|
|
|
|
|
return {name_people:i} |
|
|
|
|
|
}), |
|
|
|
|
|
progress: values.progress, |
|
|
|
|
|
publish_time: values.publish_time, |
|
|
|
|
|
o_name_project:editData?.name_project, |
|
|
|
|
|
}]; |
|
|
|
|
|
dispatch(postInProject(query)).then((res) => { |
|
|
|
|
|
if (res.success) { |
|
|
|
|
|
handleCancel(); |
|
|
|
|
|
// tableActionRef.current.reload();
|
|
|
} |
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
}; |
|
|
const importHandleCancel = () => { |
|
|
const importHandleCancel = () => { |
|
|
setImportVisible(false) |
|
|
tableActionRef.current.reload(); |
|
|
} |
|
|
setImportVisible(false); |
|
|
|
|
|
}; |
|
|
//删除资讯
|
|
|
//删除资讯
|
|
|
const delDataList = (ids, type) => { |
|
|
const delDataList = (record) => { |
|
|
dispatch(Action.delDataList(ids)).then((res) => { |
|
|
const query = { |
|
|
|
|
|
delete: record.name_project, |
|
|
|
|
|
delete_state: record.progress, |
|
|
|
|
|
table_name: "test_project", |
|
|
|
|
|
}; |
|
|
|
|
|
dispatch(delCancel(query)).then((res) => { |
|
|
if (res.success) { |
|
|
if (res.success) { |
|
|
// 刷新
|
|
|
// 刷新
|
|
|
tableActionRef.current.reload(); |
|
|
// tableActionRef.current.reload();
|
|
|
|
|
|
handleCancel() |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
}; |
|
|
}; |
|
|
//编辑
|
|
|
//编辑
|
|
|
const editor = (record) => { |
|
|
const editor = (record) => { |
|
|
setVisible(true) |
|
|
setVisible(true); |
|
|
setEditData(record) |
|
|
setEditData(record); |
|
|
}; |
|
|
}; |
|
|
return ( |
|
|
return ( |
|
|
<div style={{ height: "100%" }}> |
|
|
<div style={{ height: "100%" }}> |
|
|
@ -154,7 +187,6 @@ export const Default = (props) => { |
|
|
}} |
|
|
}} |
|
|
request={async (params) => { |
|
|
request={async (params) => { |
|
|
const res = await dispatch(postProject()); |
|
|
const res = await dispatch(postProject()); |
|
|
console.log(res) |
|
|
|
|
|
setCounts(res.payload.data.projects); |
|
|
setCounts(res.payload.data.projects); |
|
|
return { |
|
|
return { |
|
|
...res, |
|
|
...res, |
|
|
@ -167,8 +199,17 @@ export const Default = (props) => { |
|
|
}} |
|
|
}} |
|
|
/> |
|
|
/> |
|
|
</Scroller> |
|
|
</Scroller> |
|
|
<ProjectModeal visible={visible} handleOk={handOk} editData={editData} handleCancel={handleCancel}></ProjectModeal> |
|
|
<ProjectModeal |
|
|
<ImportModeal importVisible={importVisible} handleCancel={importHandleCancel} editData={editData}></ImportModeal> |
|
|
visible={visible} |
|
|
|
|
|
handleOk={handOk} |
|
|
|
|
|
editData={editData} |
|
|
|
|
|
handleCancel={handleCancel} |
|
|
|
|
|
></ProjectModeal> |
|
|
|
|
|
<ImportModeal |
|
|
|
|
|
importVisible={importVisible} |
|
|
|
|
|
handleCancel={importHandleCancel} |
|
|
|
|
|
editData={editData} |
|
|
|
|
|
></ImportModeal> |
|
|
</div> |
|
|
</div> |
|
|
); |
|
|
); |
|
|
}; |
|
|
}; |
|
|
@ -181,11 +222,10 @@ const mapStateToProps = (state) => ({}); |
|
|
|
|
|
|
|
|
export default connect(mapStateToProps)(Default); |
|
|
export default connect(mapStateToProps)(Default); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const data = [ |
|
|
const data = [ |
|
|
{ name: 'yongchu', age: '18', 任务1: 'v1', 计划1: 'time1' }, |
|
|
{ name: "yongchu", age: "18", 任务1: "v1", 计划1: "time1" }, |
|
|
{ name: 'yongchu', age: '18', 任务1: 'v1', 计划1: 'time1' }, |
|
|
{ name: "yongchu", age: "18", 任务1: "v1", 计划1: "time1" }, |
|
|
{ name: 'yongchu', age: '18', 任务1: 'v1', 计划1: 'time1' }, |
|
|
{ name: "yongchu", age: "18", 任务1: "v1", 计划1: "time1" }, |
|
|
{ name: '大王', age: '18', 任务1: 'v1', 计划1: 'time1' }, |
|
|
{ name: "大王", age: "18", 任务1: "v1", 计划1: "time1" }, |
|
|
{ name: '大王', age: '18', 任务1: 'v1', 计划1: 'time1' } |
|
|
{ name: "大王", age: "18", 任务1: "v1", 计划1: "time1" }, |
|
|
] |
|
|
]; |
|
|
|
