-
-
- {item.user.nickName || item.user.login}
+ { goUser(item.user.login) }}>
+
+ {item.user.nickname || item.user.login} {timeAgo(item.createdAt)} {!item.verifyStatus && "待审核"}
- - + {applyStatusAllNameArr[item.status]}
+
+
{
item.paperDetail.busiAttachments && item.paperDetail.busiAttachments.map(fileItem => {
@@ -120,21 +136,20 @@ export default (props) => {
-
- {item.comments.length > 0 &&
- item.comments.map(commentsItem => {
- return
@@ -150,39 +165,14 @@ export default (props) => {
{commentId === item.id &&
{
- setCommentHtml(html);
+ config={{
+ ...editorConfig,
+ placeholder: "请输入评论",
}}
+ onChange={(html) => { setCommentHtml(html) }}
/>
-
}
@@ -223,6 +213,7 @@ export default (props) => {
autoSize={{ minRows: 6 }}
className="applyText"
onChange={(e) => { setReportValue(e.target.value) }}
+ maxLength={100}
/>
-
-
}
-
+ {item.comments.length > 0 &&
+ {item.comments.map(commentsItem => {
+ return
+ {/* */}
+
+
+ })
}
- {/* */}
-
+ {commentsItem.user.nickname || commentsItem.user.login}
+ {timeAgo(commentsItem.createdAt)}
- })
+
+
+ - 任务
- 类型 -
- 应征投稿 + {publish &&
- 应征投稿 }
- 金额
- 任务状态
- 操作 @@ -61,7 +65,7 @@ export default (props) => { {publishModeArr[item.publishMode]} -
- {item.papersCount||0} + {publish &&
- {item.papersCount || 0} }
- ￥{item.bounty}
- @@ -71,13 +75,15 @@ export default (props) => {
-
{
- item.status == 0 ||item.status == 2 ?
+ item.status === 0 || item.status === 9 ?
编辑草稿 :
查看详情
}
- {item.status == 4 && 成果评选}
- {item.status == 4 && item.papersCount && (!item.isProofBoolean) && { uploadProofs(item) }} className="line_1 color-blue">上传佐证材料}
+ {item.status === 4 && 成果评选}
+ {item.status === 4 && item.papersCount && (!item.isProofBoolean) && { uploadProofs(item) }} className="line_1 color-blue">上传佐证材料}
+
+ {(item.status === 9 || item.status === 2) && { repairAdvice(item.repairAdvice) }} className="line_1 color-blue">审核意见}
{/* 支付登记 */}
{/* 上传支付凭证 */}
diff --git a/src/military/task/components/itemListTask/index.jsx b/src/military/task/components/itemListTask/index.jsx
index 21ad3a02..36402d63 100644
--- a/src/military/task/components/itemListTask/index.jsx
+++ b/src/military/task/components/itemListTask/index.jsx
@@ -1,23 +1,36 @@
import React, { useEffect, useState } from 'react';
import { Icon, Pagination } from 'antd';
+import { formatDuring } from 'educoder';
import Nodata from 'forge/Nodata';
+import { taskStatusAllArr} from '../../static';
import Loading from "src/Loading";
-
+import winpng from '../../image/win.png';
import './index.scss';
-const statusArr = ["草稿", "待审核", "已拒绝", "成果征集中", "成果评选中", "公示中", "协议签订中", "支付中", "已完成"];
+const statusArr = [];
+for (const item of taskStatusAllArr) {
+ statusArr[item.dicItemCode] = item.dicItemName;
+}
+
const classArr = ['', 'list-done', 'list-error', 'list-red', 'list-yellow', '', '', 'list-pay', 'list-gray',];
export default (props) => {
const { list, itemClick, curPage, total, changePage, loading } = props;
const [page, setPage] = useState(1);
- const [pageSize, setPageSize] = useState(() => {
- return props.pageSize || 10;
- });
+ const pageSize = props.pageSize || 10;
useEffect(() => {
changePage(page);
}, [page]);
+ function goUser(login) {
+ window.location.href = `/users/${login}`;
+ }
+
+ function surplusTime(item) {
+ let surplus = item.collectingDays * 24 * 3600 - (new Date() - new Date(item.publishedAt)) / 1000;
+ return formatDuring(surplus)
+ }
+
return (
loading ?
: @@ -29,12 +42,17 @@ export default (props) => { { itemClick(item.id) }}> {item.name || item.title} {item.status && {statusArr[item.status]}} - {(!item.status == '8') && item.delayTime && 延期中} + {(item.status !== 8) && item.delayTime && 延期中}- {item.visits || 0} -diff --git a/src/military/task/components/itemListTask/index.scss b/src/military/task/components/itemListTask/index.scss index cf01bab5..6bc5556d 100644 --- a/src/military/task/components/itemListTask/index.scss +++ b/src/military/task/components/itemListTask/index.scss @@ -7,6 +7,12 @@ background: #fff; border-bottom: 1px solid #dedede; } +.user-box{ + cursor: pointer; + &:hover{ + color: #409eff; + } +} .price { font-weight: 500; padding-top: 10px; diff --git a/src/military/task/components/itemTaskManage/index.jsx b/src/military/task/components/itemTaskManage/index.jsx new file mode 100644 index 00000000..02359292 --- /dev/null +++ b/src/military/task/components/itemTaskManage/index.jsx @@ -0,0 +1,201 @@ +import React, { useEffect, useState } from 'react'; +import { Pagination, Modal, Input, Radio } from 'antd'; +import { Link } from "react-router-dom"; +import Nodata from 'forge/Nodata'; +import Loading from "src/Loading"; +import { timeAgo } from 'educoder'; +import { checkTask } from '../../api'; +import './index.scss'; +import winpng from '../../image/win.png'; + +const { TextArea } = Input; +export default (props) => { + const { list, categoryArr, curPage, total, changePage, loading, showNotification, reloadList } = props; + const [checkedId, setCheckedId] = useState(''); + const [page, setPage] = useState(1); + const [visible, setVisible] = useState(false); + const [isRepairDocument, setIsRepairDocument] = useState('0'); + const [repairAdvice, setRepairAdvice] = useState(''); + const pageSize = props.pageSize || 10; + + useEffect(() => { + changePage(page); + }, [page]); + + + function agreeClick(id) { + Modal.confirm({ + title: '是否确认审批通过?', + onOk() { + checkTask({ + id, + isPassed: 1, + }).then(res => { + if (res.message === 'success') { + showNotification('操作成功'); + reloadList(); + } + }) + } + }); + } + + + function refuseClick(id) { + setCheckedId(id); + setVisible(true); + } + + function refuse() { + if (!repairAdvice) { + showNotification('请输入拒绝的理由'); + return; + } + checkTask({ + id: checkedId, + isPassed: 0, + isRepairDocument, + repairAdvice: repairAdvice + }).then(res => { + if (res.message === 'success') { + showNotification('操作成功'); + reloadList(); + setRepairAdvice(''); + setVisible(false); + } + }); + } + + function goUser(login) { + window.location.href = `/users/${login}`; + } + + function goUserMes(login) { + window.location.href = `/users/${login}/message_detail`; + } + + return ( + loading ?{item.papersCount || 0}人参与 - {(!item.status == '8') && item.delayTime && {item.delayTime}} + { goUser(item.user.login) }}> + {item.papersCount || 0}人参与 + {(item.status !== 8) && item.delayTime && {item.delayTime}} + {(item.status === 3) && (!item.delayTime) && 剩余{surplusTime(item)}} : + + { + list.map(item => { + return ( + + ++ ) + }) + } + + {list.length > 0 ? +++- + { goUser(item.user.login) }}>{item.user.nickname || item.user.login} + {timeAgo(item.createdAt)} + + {item.status > 2 && 已同意} + {item.status === 2 && 已拒绝} + + { + item.status === 1 &&
++ { goUserMes(item.user.login) }}>私信 + { agreeClick(item.id) }}>同意 + { refuseClick(item.id) }}>拒绝 + + } + +-
+
++ ++ + 主体名称: + {item.enterpriseName} + + + 信用代码: + 123456789123456789 + +++ + 联系手机: + {item.contactPhone}（位置分析：河北-唐山） + + + IP地址: + {item.ip}（位置分析：北京-北京） + ++ ++ + 所在行业: + {categoryArr[item.categoryId]} + + + 企业规模: + 0-10人 + + + 所在职位: + 普通员工 + ++ ++ + 任务编号: + {item.number} + + + 任务名称: + + {item.name} + + +++ {total > pageSize &&: +{ setPage(page) }} + current={curPage} + total={total} + showTotal={total => `共 ${total} 条`} + />} + } + + { setVisible(false) }} + className="form-edit-modal" + > + { setIsRepairDocument(e.target.value) }}> + +不允许重新发布 +允许修缮后重新发布 + - + { goUser(item.user.login) }}>{item.user.nickname || item.user.login} + {timeAgo(item.createdAt)} + + {item.status > 2 && 已同意} + {item.status === 2 && 已拒绝} + + { + item.status === 1 &&