diff --git a/src/military/task/static.js b/src/military/task/static.js
index 51e3c6b8..c2a28708 100644
--- a/src/military/task/static.js
+++ b/src/military/task/static.js
@@ -106,9 +106,9 @@ export const applyStatusAllArr = [
];
export const paperCheckStatusArr = [
- { dicItemCode: "0", name: "待审核", dicItemName: "待审核" },
+ { dicItemCode: "2", name: "待审核", dicItemName: "待审核" },
{ dicItemCode: "1", name: "通过", dicItemName: "通过" },
- { dicItemCode: "2", name: "未通过", dicItemName: "未通过" },
+ { dicItemCode: "0", name: "未通过", dicItemName: "未通过" },
];
export const paperCheckTextArr = [
diff --git a/src/military/task/taskAdmin/index.jsx b/src/military/task/taskAdmin/index.jsx
index 7b6a6c81..851098a1 100644
--- a/src/military/task/taskAdmin/index.jsx
+++ b/src/military/task/taskAdmin/index.jsx
@@ -1,14 +1,14 @@
import React, { useCallback, useEffect, useState, useMemo } from 'react';
import classNames from 'classnames';
-import { Input, Select, Button, Form, DatePicker, Table, Pagination, Modal, message } from 'antd';
+import { Input, Select, Button, Form, DatePicker, Modal, message, Popover } from 'antd';
import { Link } from 'react-router-dom';
-import { paperCheckStatusArr, publishModeArr, taskStatusAllArr, showUserModeArr, main_web_site_url, expertReviewArr } from '../static';
+import { paperCheckStatusArr, publishModeArr, taskStatusAllArr, showUserModeArr, main_web_site_url } from '../static';
import { getTaskAdminList, changeShowUserMode, deleteTask, recommendTask, addExpertReview, publishExpertsAndRules } from '../api';
import '../index.scss';
import './index.scss';
import { getRules, selectExpertList } from 'src/military/expert/api';
-import PaginationTable from '../../../../src/military/components/paginationTable';
+import PaginationTable from '../../../components/pagination-table';
const format = "YYYY-MM-DD HH:mm:ss";
const Option = Select.Option;
@@ -21,7 +21,7 @@ for (const item of paperCheckStatusArr) {
checkStatusArr[item.dicItemCode] = item.dicItemName;
}
-
+// 管理端 创客任务列表
export default Form.create()(({ form, showNotification, match, history, state }) => {
const { getFieldDecorator, setFieldsValue, getFieldsValue } = form;
const { hash} = history && history.location;
@@ -48,6 +48,8 @@ export default Form.create()(({ form, showNotification, match, history, state })
const [rules, setRules] = useState(undefined);
const [selectedExperts, setSelectedExperts] = useState(undefined);
const [publicTaskId, setPublicTaskId] = useState(undefined);
+ // 加入专家评审的创客id数组
+ const [reviewTaskId, setReviewTaskId] = useState(undefined);
useEffect(()=>{
setCurPage(hashDate(hash) || 1);
@@ -69,6 +71,11 @@ export default Form.create()(({ form, showNotification, match, history, state })
setLoading(true);
getTaskAdminList(params).then(data => {
if (data) {
+ let taskIds = [];
+ for(const item of data.rows){
+ item.expertReview && (taskIds[taskIds.length] = item.id)
+ }
+ setReviewTaskId(taskIds.toString());
setTaskList(data.rows);
setTotal(data.total);
}
@@ -102,116 +109,78 @@ export default Form.create()(({ form, showNotification, match, history, state })
startTime: '',
endTime: '',
nameInput: '',
- enterpriseNameInput: ''
+ enterpriseNameInput: '',
+ taskMode: '0,1,2,3,4,5,6,7,8,9',
+ showUserMode: '0,1,2',
+ publishMode1: '0,1',
+ expertReviewStatus: '-1',
+ showStatus: '0',
+ isRecommend: 'all',
+ sortBy: 'createdAt'
});
+ setStatusString('0,1,2,3,4,5,6,7,8,9');
+ setShowUserMode('0,1,2');
+ setPublishMode('0,1');
+ setExpertReview('-1');
+ setIsDelete('0');
+ setRecommend('');
+ setOrder("createdAt");
setSearchObj({});
}
const columns = useMemo(() => {
return [
+ {
+ title: '任务编号',
+ dataIndex: 'number',
+ width: "26%"
+ },
{
title: '任务名称',
dataIndex: 'name',
- width: "13%",
+ width: "10%",
render: (text, record) => (
-
{text}
+
+ 任务名称:{text}
+ 截稿时间:{record.collectingEndTime && record.collectingEndTime.replaceAll('-','/').substring(0,16) || '--'}
+ 稿件数:{record.papersCount || '--'}
+ ,
- dataIndex: 'expertReview',
+ title: '发布主体',
+ dataIndex: 'enterpriseName',
+ },
+ {
+ title: '发布时间',
+ dataIndex: 'publishedAt',
+ width: "8%",
render: (text, record) => {
- return
+ text = text && text.replaceAll('-','/').substring(0,16);
+ return text || '--'
}
},
{
- title:
,
+ title: '发布方式',
dataIndex: 'publishMode',
render: (text, record) => {
- return publishModeArr[text]
+ return
,
- width: '6%',
+ title: '任务状态',
dataIndex: 'status',
render: (text, record) => {
return record.exceptClosedBoolean ? '已关闭' : statusArr[text]
}
},
{
- title: '发布主体',
- dataIndex: 'enterpriseName',
- width: '9%',
- },
- {
- title: '发布时间',
- dataIndex: 'publishedAt',
- width: '7%',
- render: (text, record) => {
- return text || '--'
- }
- },
- {
- // title: '应征者名单公示',
- title:
,
+ title: '应征者公示',
dataIndex: 'showUserMode',
- width:'8%',
render: (text, record) => {
return