diff --git a/web/client/src/sections/personnel/actions/article.js b/web/client/src/sections/personnel/actions/article.js
index 3e311cd..225eaad 100644
--- a/web/client/src/sections/personnel/actions/article.js
+++ b/web/client/src/sections/personnel/actions/article.js
@@ -86,3 +86,15 @@ export function postInPeople(articleObj) {
// reducer: { name: "articleInsertInfo" },
});
}
+export function delCancel(query) {
+ return (dispatch) =>
+ basicAction({
+ type: "post",
+ dispatch: dispatch,
+ data: query,
+ actionType: "DEL_CANCEL",
+ url: `${ApiTable.delCancel}`,
+ msg: { error: "删除项目信息失败" },
+ // reducer: { name: "articleInsertInfo" },
+ });
+}
diff --git a/web/client/src/sections/personnel/components/import_model.js b/web/client/src/sections/personnel/components/import_model.js
index f144154..362e984 100644
--- a/web/client/src/sections/personnel/components/import_model.js
+++ b/web/client/src/sections/personnel/components/import_model.js
@@ -54,18 +54,9 @@ const ImportUser = (props) => {
})
}}>下载模板 */}
-
-
-
+
+
+
下载模板后填写完整后上传
{
for (let i = 0; i < res.length; i++) {
let d = res[i];
let name_people = String(d["人员姓名"]).trim();
-
let post_people = String(d["岗位"]).trim();
- let time = String(d["本周计划"]).trim();
- let project = String(d["本周任务"]).trim();
- if (!name_people || !post_people || !time || !project) {
+
+ let md = String(d["周一"]).trim();
+ let td = String(d["周二"]).trim();
+ let wd = String(d["周三"]).trim();
+ let thd = String(d["周四"]).trim();
+ let fd = String(d["周五"]).trim();
+ let sd = String(d["周六"]).trim();
+ let ssd = String(d["周日"]).trim();
+ if (!name_people || !post_people || !md || !td||!wd||!thd||!fd||!sd||!ssd) {
error(`第${i + 1} 行有空值，请填写后重新上传`);
return;
}
postData.push({
name_people,
- post_people,
- time,
- project,
+ post_people,md,td,wd,thd,fd,sd,ssd
+
});
}
if (postData.length) {
- let newArray = postData.reduce((total, cur, index) => {
- let hasValue = total.findIndex((current) => {
- return current.name_people === cur.name_people;
- });
- let obj = {
- name_people: cur.name_people,
- post_people: cur.post_people,
- work: [
- {
- time: cur.time,
- project: cur.project,
- },
- ],
- };
- let obj1 = {
- time: cur.time,
- project: cur.project,
- };
- hasValue === -1 && total.push(obj);
- hasValue !== -1 && total[hasValue].work.push(obj1);
- return total;
- }, []);
- console.log(newArray);
- setPostData(newArray);
+ // let newArray = postData.reduce((total, cur, index) => {
+ // let hasValue = total.findIndex((current) => {
+ // return current.name_people === cur.name_people;
+ // });
+ // let obj = {
+ // name_people: cur.name_people,
+ // post_people: cur.post_people,
+ // work: [
+ // {
+ // time: cur.time,
+ // project: cur.project,
+ // },
+ // ],
+ // };
+ // let obj1 = {
+ // time: cur.time,
+ // project: cur.project,
+ // };
+ // hasValue === -1 && total.push(obj);
+ // hasValue !== -1 && total[hasValue].work.push(obj1);
+ // return total;
+ // }, []);
+ // console.log(newArray);
+ setPostData(postData);
}
let msg = "文件解析完成，点击确定按钮上传保存！";
setMsg(msg);
diff --git a/web/client/src/sections/personnel/components/modeal.js b/web/client/src/sections/personnel/components/modeal.js
index 8db4470..911de20 100644
--- a/web/client/src/sections/personnel/components/modeal.js
+++ b/web/client/src/sections/personnel/components/modeal.js
@@ -12,8 +12,14 @@ function modeal(props) {
name_people: editData.name_people,
post_people: editData.post_people,
progress: editData.progress,
- time:editData.work.map((i)=>i.time),
- project:editData.work.map((i)=>i.project)
+ md: editData.md,
+ td: editData.td,
+ wd: editData.wd,
+ thd: editData.thd,
+ fd: editData.fd,
+ sd: editData.sd,
+ ssd: editData.ssd,
+
})
}
@@ -46,67 +52,58 @@ function modeal(props) {
>
- {/* {editData?.work.map(() => {
- return <>
-
- })} */}
-
- {(fields, { add, remove }) => (
- <>
- {editData?.work.map(({ key, name, ...restField }) => (
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- ))}
-
-
-
-
- )}
-
+
+
+
+
+
{
const [importVisible, setImportVisible] = useState(false); //弹窗
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 = [
{
title: "人员姓名",
@@ -42,14 +41,61 @@ export const Default = (props) => {
},
},
{
- title: "本周工作计划",
- key: "work",
- dataIndex: "work",
+ title: "周一",
+ key: "md",
+ dataIndex: "md",
hideInSearch: true,
render: (dom, record) => {
- return
{record?.work?.map((item) => {
- return
{item.time}{item.project }
- })}
+ return record.md
+ },
+ },
+ {
+ title: "周二",
+ key: "td",
+ dataIndex: "td",
+ hideInSearch: true,
+ render: (dom, record) => {
+ return record.td
+ },
+ },{
+ title: "周三",
+ key: "wd",
+ dataIndex: "wd",
+ hideInSearch: true,
+ render: (dom, record) => {
+ return record.wd
+ },
+ },{
+ title: "周四",
+ key: "thd ",
+ dataIndex: "thd ",
+ hideInSearch: true,
+ render: (dom, record) => {
+ return record.thd
+ },
+ },{
+ title: "周五",
+ key: "fd",
+ dataIndex: "fd",
+ hideInSearch: true,
+ render: (dom, record) => {
+ return record.fd
+ },
+ },{
+ title: "周六",
+ key: "sd",
+ dataIndex: "sd",
+ hideInSearch: true,
+ render: (dom, record) => {
+ return record.sd
+ },
+ },{
+ title: "周日",
+ key: "ssd",
+ dataIndex: "ssd",
+ hideInSearch: true,
+ render: (dom, record) => {
+ return record.ssd
},
},
{
@@ -71,7 +117,7 @@ export const Default = (props) => {
{
- delDataList(record.id);
+ delDataList(record);
}}
>
@@ -103,19 +149,44 @@ export const Default = (props) => {
];
const handleCancel = () => {
setVisible(false)
+ tableActionRef.current.reload();
}
- const handOk = () => {
-
+ const handOk = (values) => {
+ const query = [{
+ name_people: values.name_people,
+ post_people: values.post_people,
+ md: values.md,
+ td: values.td,
+ wd: values.wd,
+ thd: values.thd,
+ fd: values.fd,
+ sd: values.sd,
+ ssd: values.ssd,
+ o_name_people:editData?.name_people,
+ }];
+ dispatch(postInPeople(query)).then((res) => {
+ if (res.success) {
+ handleCancel();
+ // tableActionRef.current.reload();
+ }
+ });
}
const importHandleCancel = () => {
setImportVisible(false)
+ tableActionRef.current.reload();
}
//删除资讯
- const delDataList = (ids, type) => {
- dispatch(Action.delDataList(ids)).then((res) => {
+ const delDataList = (record) => {
+ const query = {
+ delete: record?.name_people,
+ delete_state: record?.post_people,
+ table_name: "test_people",
+ };
+ dispatch(delCancel(query)).then((res) => {
if (res.success) {
// 刷新
- tableActionRef.current.reload();
+ // tableActionRef.current.reload();
+ handleCancel()
}
});
};
@@ -137,7 +208,6 @@ export const Default = (props) => {
collapsed: false,
}}
request={async(params) => {
- console.log(params)
const res = await dispatch(postOutPeople());
setCounts(res.payload.data.projects);
diff --git a/web/client/src/sections/wait/actions/article.js b/web/client/src/sections/wait/actions/article.js
index cdada0d..ffe43b9 100644
--- a/web/client/src/sections/wait/actions/article.js
+++ b/web/client/src/sections/wait/actions/article.js
@@ -3,62 +3,38 @@ import { ApiTable } from "$utils";
import { Request } from "@peace/utils";
import { basicAction } from "@peace/utils";
-export function addArticle(articleObj) {
+export function postWaitUrl(articleObj) {
return (dispatch) =>
basicAction({
type: "post",
dispatch: dispatch,
data: articleObj,
- actionType: "ADD_ARTICLE",
- url: `${ApiTable.addArticle}`,
- msg: { error: "新增文章失败" },
- reducer: { name: "articleInsertInfo" },
+ actionType: "POST_WAITURL",
+ url: `${ApiTable.waitUrl}`,
+ msg: { error: "获取项目失败" },
});
}
-
-export function editArticle(articleObj) {
+export function postInWait(articleObj) {
return (dispatch) =>
basicAction({
- type: "put",
+ type: "post",
dispatch: dispatch,
data: articleObj,
- actionType: "EDIT_ARTICLE",
- url: `${ApiTable.addArticle}`,
- msg: { error: "编辑文章失败" },
- reducer: { name: "articleInsertInfo" },
+ actionType: "POST_INWAIT",
+ url: `${ApiTable.postInWait}`,
+ msg: { error: "添加项目失败" },
});
}
-export function getDataList(query) {
+export function delCancel(query) {
return (dispatch) =>
basicAction({
- type: "get",
+ type: "post",
dispatch: dispatch,
- actionType: "GET_DATALIST",
- url: ApiTable.getDataList,
- query: query,
- msg: { error: "获取文章信息失败" },
- reducer: {
- name: "articlesfrom",
- },
+ data: query,
+ actionType: "DEL_CANCEL",
+ url: `${ApiTable.delCancel}`,
+ msg: { error: "删除项目信息失败" },
+ // reducer: { name: "articleInsertInfo" },
});
}
-export function delDataList(id) {
- return (dispatch) =>
- basicAction({
- type: "del",
- dispatch: dispatch,
- actionType: "DEL_DATALIST11",
- url: ApiTable.delDataList + `?id=${id}`,
- query: { id: id },
- msg: { error: "删除文章信息失败" },
- });
-}
-export const MODIFYARTICAL = {
- REQUEST_SUCCESS: "MODIFY_ARTICAL_SUCCESS",
-};
-export function setModifyData(data) {
- return (dispatch) => {
- dispatch({ type: MODIFYARTICAL.REQUEST_SUCCESS, payload: { data } });
- };
-}
diff --git a/web/client/src/sections/wait/components/import_model.js b/web/client/src/sections/wait/components/import_model.js
index 41098a5..51b1368 100644
--- a/web/client/src/sections/wait/components/import_model.js
+++ b/web/client/src/sections/wait/components/import_model.js
@@ -53,7 +53,7 @@ const ImportUser = props => {
})
}}>下载模板 */}
-
+
下载模板后填写完整后上传
diff --git a/web/client/src/sections/wait/components/modeal.js b/web/client/src/sections/wait/components/modeal.js
index 53e5c41..3782a04 100644
--- a/web/client/src/sections/wait/components/modeal.js
+++ b/web/client/src/sections/wait/components/modeal.js
@@ -3,19 +3,21 @@ import { Modal, Form, Input, Button,DatePicker,Select } from 'antd'
import dayjs from 'dayjs';
function modeal(props) {
const [form] = Form.useForm();
- const { visible, handleOk, handleCancel, editData } = props
+ const { visible, handleOk, handleCancel, editData ,setEditData,setState} = props
console.log(editData)
useEffect(() => {
if (editData && visible) {
form.setFieldsValue({
name_project: editData.name_project,
- part_people: editData.part_people,
- build_time: dayjs(editData?.build_time),
- publish_time: dayjs(editData.publish_time),
+ from_project: editData.from_project,
+ contacts: editData.contacts,
progress:editData.progress
})
+ setState(true)
}
}, [editData, visible])
+
+
return (
-
-
+
-
-
-
-
+
- )
-
+ );
},
},
{
@@ -96,37 +92,72 @@ export const Default = (props) => {
type="primary"
style={{ width: "200px" }}
onClick={() => {
- setImportVisible(true)
+ editor();
}}
>
- 项目信息导入
+ 添加
);
},
},
];
const handleCancel = () => {
- setVisible(false)
- }
- const handOk = () => {
+ tableActionRef.current.reload();
+ setVisible(false);
+ };
+ const handOk = (values) => {
+ let query = null;
+ if (state) {
+ query = [
+ {
+ name_project: values.name_project,
+ from_project: values.from_project,
+ contacts: values.contacts,
+ progress: values.progress,
+ o_name_project: editData?.name_project,
+ },
+ ];
+ } else {
+ query = [
+ {
+ name_project: values.name_project,
+ from_project: values.from_project,
+ contacts: values.contacts,
+ progress: values.progress,
+ },
+ ];
+ }
+
+ dispatch(postInWait(query)).then((res) => {
+ if (res.success) {
+ handleCancel();
+ setEditData([]);
+ tableActionRef.current.reload();
+ }
+ });
+ };
- }
- const importHandleCancel = () => {
- setImportVisible(false)
- }
//删除资讯
- const delDataList = (ids, type) => {
- dispatch(Action.delDataList(ids)).then((res) => {
+ const delDataList = (record) => {
+ const query = {
+ delete: record.name_project,
+ delete_state: record.progress,
+ table_name: "test_waiting",
+ };
+ dispatch(delCancel(query)).then((res) => {
if (res.success) {
// 刷新
- tableActionRef.current.reload();
+ // tableActionRef.current.reload();
+ handleCancel()
}
});
};
//编辑
const editor = (record) => {
- setVisible(true)
- setEditData(record)
+ if (record) {
+ setEditData(record);
+ }
+ setVisible(true);
};
return (
@@ -135,28 +166,14 @@ export const Default = (props) => {
actionRef={tableActionRef}
columns={columns}
options={false}
- dataSource={dataSore}
+ dataSource={counts || []}
search={{
optionRender: false,
collapsed: false,
}}
request={async (params) => {
- let query = {
- type: -1,
- searchValue: heading,
- status: state,
- page: params.current,
- limit: params.pageSize,
- publishTime:
- day && day.length && day[0].trim() != ""
- ? JSON.stringify([
- moment(day[0]).startOf("day"),
- moment(day[1]).endOf("day"),
- ])
- : null,
- };
- const res = await dispatch(Action.getDataList(query));
- setCounts(res.payload.data);
+ const res = await dispatch(postWaitUrl());
+ setCounts(res.payload.data.projects);
return {
...res,
total: res.payload.data ? res.payload.data.total : 0,
@@ -168,8 +185,15 @@ export const Default = (props) => {
}}
/>
-
-
+
);
};
@@ -182,11 +206,10 @@ const mapStateToProps = (state) => ({});
export default connect(mapStateToProps)(Default);
-
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: '大王', age: '18', 任务1: 'v1', 计划1: 'time1' },
- { name: '大王', age: '18', 任务1: 'v1', 计划1: 'time1' }
-]
\ No newline at end of file
+ { 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" },
+];
diff --git a/web/client/src/utils/webapi.js b/web/client/src/utils/webapi.js
index 0521bde..957e728 100644
--- a/web/client/src/utils/webapi.js
+++ b/web/client/src/utils/webapi.js
@@ -7,12 +7,12 @@ export const ApiTable = {
peopleUrl: "outPeople", // 人员情况
waitUrl: "outWait", // 待研项目
postInProject:'inProject', // 增加项目
- postInPeople:'inPeople',//增加人员任务
- //支委会人员信息
- getCommittee: "partyOrganizations", //获取支委会人员
- postCommittee: "partyOrganization", //新增
- putCommittee: "partyOrganization/:id", //修改
- apiRoot: 'query/api/root',
+ postInPeople: 'inPeople',//增加人员任务
+ postInWait: 'inWait',//增加人员任务
+
+ delCancel: 'deleteDB', //删除信息
+ //下载项目模板
+ getDownProject:'downProject'
};
export const RouteTable = {