diff --git a/src/military/task/static.js b/src/military/task/static.js
index 8bb0c738..678341af 100644
--- a/src/military/task/static.js
+++ b/src/military/task/static.js
@@ -102,6 +102,11 @@ export const paperComplainStatusArr=[
{ dicItemCode: '2', name: "待审核", dicItemName: '待审核' },
]
+export const showUserModeArr=[
+ { dicItemCode: 0, name: "不公示", dicItemName: '不公示' },
+ { dicItemCode: 1, name: "自动公示", dicItemName: '自动公示' },
+ { dicItemCode: 2, name: "手动公示", dicItemName: '手动公示' },
+]
export const formItemLayout = {
labelCol: {
diff --git a/src/military/task/taskAdmin/index.jsx b/src/military/task/taskAdmin/index.jsx
new file mode 100644
index 00000000..4ba54c9a
--- /dev/null
+++ b/src/military/task/taskAdmin/index.jsx
@@ -0,0 +1,237 @@
+import React, { useCallback, useEffect, useState, useMemo } from 'react';
+import { Input, Select, Button, Form, DatePicker, Table, Pagination, } from 'antd';
+import { Link } from "react-router-dom";
+import { paperCheckStatusArr, publishModeArr, taskStatusAllArr, showUserModeArr } from '../static';
+import { getTaskAdminList, changeShowUserMode } from '../api';
+import '../index.scss';
+import './index.scss';
+const format = "YYYY-MM-DD HH:mm:ss";
+const Option = Select.Option;
+
+const statusArr = [];
+for (const item of taskStatusAllArr) {
+ statusArr[item.dicItemCode] = item.dicItemName;
+}
+const checkStatusArr = [];
+for (const item of paperCheckStatusArr) {
+ checkStatusArr[item.dicItemCode] = item.dicItemName;
+}
+export default Form.create()(({ current_user, form, showNotification, match, history }) => {
+
+
+ const { getFieldDecorator, validateFields, setFieldsValue, getFieldsValue } = form;
+
+ const [loading, setLoading] = useState(false);
+ const [searchObj, setSearchObj] = useState({
+ // checkStatus: '0'
+ });
+ const [curPage, setCurPage] = useState(1);
+ const [total, setTotal] = useState(0);
+ const [taskList, setTaskList] = useState([]);
+
+ const [reload, setReload] = useState(0);
+ const [visible, setVisible] = useState(false);
+ const [activeId, setActiveId] = useState('');
+
+
+ useEffect(() => {
+ const params = {
+ ...searchObj,
+ curPage,
+ pageSize: 10,
+ };
+ setLoading(true);
+ getTaskAdminList(params).then(data => {
+ if (data) {
+ setTaskList(data.rows);
+ setTotal(data.total);
+ }
+ setLoading(false);
+ })
+ }, [reload, curPage, searchObj]);
+
+
+ const helper = useCallback(
+ (label, name, rules, widget, initialValue) => (
+
+ {getFieldDecorator(name, { rules, initialValue, validateFirst: true, })(widget)}
+
+ ), []);
+
+
+ function onSearch() {
+ let values = getFieldsValue(['checkStatus', 'endCreatedAt', 'startCreatedAt']);
+ if (values.startCreatedAt) values.startCreatedAt = values.startCreatedAt.format(format);
+ if (values.endCreatedAt) values.endCreatedAt = values.endCreatedAt.format(format);
+ if (values.checkStatus === '0,1,2') values.checkStatus = '';
+ setSearchObj(values);
+ }
+
+ function clearSearch() {
+ setFieldsValue({
+ startCreatedAt: '',
+ endCreatedAt: '',
+ checkStatus: '0,1,2'
+ });
+ setSearchObj({});
+ }
+
+ const columns = useMemo(() => {
+ return [
+ {
+ title: '序号',
+ dataIndex: 'index',
+ render: (text, record, index) => {
+ return
{index + 1}
+ }
+ },
+ {
+ title: '任务编号',
+ dataIndex: 'number',
+ },
+ {
+ title: '任务名称',
+ dataIndex: 'name',
+ width: "20%",
+ render: (text, record) => (
+
{text}
+ ),
+ },
+ {
+ title: '发布方式',
+ dataIndex: 'publishMode',
+ render: (text, record) => {
+ return publishModeArr[text]
+ }
+ },
+ {
+ title: '任务状态',
+ dataIndex: 'status',
+ render: (text, record) => {
+ return statusArr[text]
+ }
+ },
+ {
+ title: '提交时间',
+ dataIndex: 'createdAt',
+ },
+ {
+ title: '截稿时间',
+ dataIndex: 'collectingEndTime',
+ },
+ {
+ title: '应征者名单公示',
+ dataIndex: 'showUserMode',
+ render: (text, record) => {
+ return
+ }
+ },
+ // {
+ // title: '操作',
+ // key: 'action',
+ // render: (text, record) => (
+ //
+ // {/* */}
+ // 查看
+ //
+ // ),
+ // },
+ ]
+ }, []);
+
+ function changeStatus(showUserMode, taskId) {
+ changeShowUserMode({
+ taskId,
+ showUserMode
+ }).then(res=>{
+ console.log(res);
+ })
+ }
+
+ return (
+
+
+ {helper(
+ "任务名称",
+ "nameInput",
+ [{ max: 20, message: '长度不能超过20个字符' }],
+
+ )}
+
+ {helper(
+ "发布主体名称",
+ "enterpriseNameInput",
+ [{ max: 20, message: '长度不能超过20个字符' }],
+
+ )}
+
+
+
+ {helper(
+ "发布时间:",
+ "startCreatedAt",
+ [],
+
+ )}
+
+ {helper(
+ "",
+ "endCreatedAt",
+ [],
+
+ )}
+
+
+
+
+
+
+
+
+
+
+
row.id}
+ dataSource={taskList}
+ columns={columns}
+ pagination={false}
+ className="mt10"
+ />
+ {total > 10 &&
+ { setCurPage(page) }}
+ current={curPage}
+ total={total}
+ />}
+
+
+
+
+
+ )
+}
+)
\ No newline at end of file
diff --git a/src/military/task/taskAdmin/index.scss b/src/military/task/taskAdmin/index.scss
new file mode 100644
index 00000000..b66f0d77
--- /dev/null
+++ b/src/military/task/taskAdmin/index.scss
@@ -0,0 +1,25 @@
+.search-screen {
+ display: flex;
+ flex-flow: row wrap;
+ justify-content: space-between;
+ margin: 1.25rem 0;
+ padding:1.25rem;
+ background-color: #fff;
+ border-bottom: 1px solid #dedede;
+
+ >.ant-row{
+ min-width: 40%;
+ .ant-form-item-control-wrapper{
+ min-width: 60%;
+ }
+ }
+ .ant-form-item-control-wrapper{
+ display: inline-block;
+ }
+ .center-right-but{
+ .ant-form-item{
+ margin: 0 1rem 0 0;;
+ }
+ }
+
+}